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

update.sh: abort rebase and merge.

Browse Source 
`brew update` can cause these so `brew update` should repair these.
This commit is contained in:
Mike McQuaid 2016-05-03 15:28:00 +01:00
parent 60e3737f17
commit 70096f8e91
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -121,6 +121,8 @@ reset_on_interrupt() {
if [[ -n "$INITIAL_REVISION" ]] if [[ -n "$INITIAL_REVISION" ]]
then then
git rebase --abort &>/dev/null
git merge --abort &>/dev/null
git reset --hard "$INITIAL_REVISION" "${QUIET_ARGS[@]}" git reset --hard "$INITIAL_REVISION" "${QUIET_ARGS[@]}"
fi fi
@ -179,6 +181,7 @@ pull() {
git status --short --untracked-files=all git status --short --untracked-files=all
fi fi
git merge --abort &>/dev/null git merge --abort &>/dev/null
git rebase --abort &>/dev/null
git -c "user.email=brew-update@localhost" \ git -c "user.email=brew-update@localhost" \
-c "user.name=brew update" \ -c "user.name=brew update" \
stash save --include-untracked "${QUIET_ARGS[@]}" stash save --include-untracked "${QUIET_ARGS[@]}"