admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

update.sh: reset pre-stash, die if stash fails.

Browse Source 
A `git reset --hard` without stashing first risks nuking in-progress
work. A `git reset --mixed` should allow stashing to occur more often
on e.g. merge conflicts.

Fixes #766.
This commit is contained in:
Mike McQuaid 2016-08-25 11:40:18 +01:00
parent df21e57179
commit 46a3003a2f
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Library/Homebrew/cmd/update.sh
View File

@ -226,9 +226,18 @@ merge_or_rebase() {
fi fi
git merge --abort &>/dev/null git merge --abort &>/dev/null
git rebase --abort &>/dev/null git rebase --abort &>/dev/null
git -c "user.email=brew-update@localhost" \ git reset --mixed "${QUIET_ARGS[@]}"
-c "user.name=brew update" \ if ! git -c "user.email=brew-update@localhost" \
stash save --include-untracked "${QUIET_ARGS[@]}" -c "user.name=brew update" \
stash save --include-untracked "${QUIET_ARGS[@]}"
then
odie <<EOS
Could not `git stash` in $DIR!
Please stash/commit manually if you need to keep your changes or, if not, run:
cd $DIR
git reset --hard origin/master
EOS
fi
git reset --hard "${QUIET_ARGS[@]}" git reset --hard "${QUIET_ARGS[@]}"
STASHED="1" STASHED="1"
fi fi