[PATCH] pull: suppress error when no remoteref is found
- From
John Keeping <john@keeping.me.uk>
- Date
- Jan 17, 2014, 20:00 UTC
- Message-ID
- <509ac5f3245546def79575174c52de2d0416fe24.1389988820.git.john@keeping.me.uk>
- In-Reply-To
- <20140117192619.GP7608@serenity.lan>
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> --- git-pull.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
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
-- 1.8.5.226.g0d60d77