diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-01-17 21:04:29 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-01-17 21:04:29 +0100 |
| commit | d8cf714c0edf261a2bcc126fc240b10ed04a5b8d (patch) | |
| tree | d4a822512c1181ab20539ce04246c5adf77fe0e6 /git-pull.sh | |
| parent | Sync with 1.8.5.3 (diff) | |
| parent | pull: suppress error when no remoteref is found (diff) | |
| download | git-d8cf714c0edf261a2bcc126fc240b10ed04a5b8d.tar.xz git-d8cf714c0edf261a2bcc126fc240b10ed04a5b8d.zip | |
Merge branch 'jk/pull-rebase-using-fork-point'
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
Diffstat (limited to 'git-pull.sh')
| -rwxr-xr-x | git-pull.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-pull.sh b/git-pull.sh index f210d0a147..0a5aa2c821 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -229,7 +229,7 @@ test true = "$rebase" && { test -n "$curr_branch" && . git-parse-remote && 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) git fetch $verbosity $progress $dry_run $recurse_submodules --update-head-ok "$@" || exit 1 |