summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-01-17 20:04:29 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-01-17 20:04:29 (GMT)
commitd8cf714c0edf261a2bcc126fc240b10ed04a5b8d (patch)
treed4a822512c1181ab20539ce04246c5adf77fe0e6
parent14598b907008dc9952428662a30ecfd74dc90a79 (diff)
parentffc2b483dee43c2687088d4c73d7532fda855050 (diff)
downloadgit-d8cf714c0edf261a2bcc126fc240b10ed04a5b8d.zip
git-d8cf714c0edf261a2bcc126fc240b10ed04a5b8d.tar.gz
git-d8cf714c0edf261a2bcc126fc240b10ed04a5b8d.tar.bz2
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
-rwxr-xr-xgit-pull.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-pull.sh b/git-pull.sh
index f210d0a..0a5aa2c 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