Skip to content

Commit

Permalink
git-merge: squelch needless error message.
Browse files Browse the repository at this point in the history
While deciding if the new style command line argument is a tag
or a branch, we checked it with "git show-ref -s --verify" to
see if results in an error, but when it is not a branch, the
check leaked the error message out, which was not needed to be
shown to the end user.

Signed-off-by: Junio C Hamano <junkio@cox.net>
  • Loading branch information
Junio C Hamano committed Dec 6, 2006
1 parent c0b7391 commit 211e6eb
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion git-merge.sh
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ else
merge_name=$(for remote
do
rh=$(git-rev-parse --verify "$remote"^0 2>/dev/null) &&
bh=$(git show-ref -s --verify "refs/heads/$remote") &&
bh=$(git show-ref -s --verify "refs/heads/$remote" 2>/dev/null) &&
if test "$rh" = "$bh"
then
echo "$rh branch '$remote' of ."
Expand Down

0 comments on commit 211e6eb

Please sign in to comment.