undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-merge: squelch needless error message.

Browse Source 
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>
This commit is contained in:
Junio C Hamano 2006-12-06 10:52:04 -08:00
parent c0b7391bf5
commit 211e6eb513
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-merge.sh
View File

@ -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 ."