undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/pull-rebase-using-fork-point'

Browse Source 
Finishing touches so that an expected error message will not leak to
the UI.

* jk/pull-rebase-using-fork-point:
  pull: suppress error when no remoteref is found
This commit is contained in:
Junio C Hamano 2014-01-17 12:04:29 -08:00
commit d8cf714c0e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-pull.sh
View File

@ -229,7 +229,7 @@ test true = "$rebase" && {
test -n "$curr_branch" && test -n "$curr_branch" &&
. git-parse-remote && . git-parse-remote &&
remoteref="$(get_remote_merge_branch "$@" 2>/dev/null)" && remoteref="$(get_remote_merge_branch "$@" 2>/dev/null)" &&
oldremoteref=$(git merge-base --fork-point "$remoteref" $curr_branch) oldremoteref=$(git merge-base --fork-point "$remoteref" $curr_branch 2>/dev/null)
} }
orig_head=$(git rev-parse -q --verify HEAD) orig_head=$(git rev-parse -q --verify HEAD)
git fetch $verbosity $progress $dry_run $recurse_submodules --update-head-ok "$@" || exit 1 git fetch $verbosity $progress $dry_run $recurse_submodules --update-head-ok "$@" || exit 1