pull: suppress error when no remoteref is found
Commit 48059e4 (pull: use merge-base --fork-point when appropriate, 2013-12-08) incorrectly assumes that get_remote_merge_branch will either yield a non-empty string or return an error, but there are circumstances where it will yield an empty string. The previous code then invoked git-rev-list with no arguments, which results in an error suppressed by redirecting stderr to /dev/null. Now we invoke git-merge-base with an empty branch name, which also results in an error. Suppress this in the same way. Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
John Keeping committed
Jan 17, 2014 at 20:00 UTC
ffc2b483dee43c2687088d4c73d7532fda855050
1 file changed
+1
-1
git-pull.sh
+1
-1
@@ -229,7 +229,7 @@ test true = "$rebase" && {
229
test -n "$curr_branch" &&
230
. git-parse-remote &&
231
remoteref="$(get_remote_merge_branch "$@" 2>/dev/null)" &&
232
- oldremoteref=$(git merge-base --fork-point "$remoteref" $curr_branch)
232
+ oldremoteref=$(git merge-base --fork-point "$remoteref" $curr_branch 2>/dev/null)
233
}
234
orig_head=$(git rev-parse -q --verify HEAD)
235
git fetch $verbosity $progress $dry_run $recurse_submodules --update-head-ok "$@" || exit 1