Browse Source

git-merge: squelch needless error message.

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>
maint
Junio C Hamano 18 years ago
parent
commit
211e6eb513
  1. 2
      git-merge.sh

2
git-merge.sh

@ -189,7 +189,7 @@ else
merge_name=$(for remote merge_name=$(for remote
do do
rh=$(git-rev-parse --verify "$remote"^0 2>/dev/null) && 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" if test "$rh" = "$bh"
then then
echo "$rh branch '$remote' of ." echo "$rh branch '$remote' of ."

Loading…
Cancel
Save