diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-12-06 10:52:04 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-06 10:52:04 -0800 |
| commit | 211e6eb513f372ad79fecc3db19413b3573ae962 (patch) | |
| tree | 0425cf69ba0b88f4e332d61ec3f749d5e4be9705 /git-merge.sh | |
| parent | c0b7391bf5dd314523b8c6ea29ffafc8769f2eb1 (diff) | |
| download | git-211e6eb513f372ad79fecc3db19413b3573ae962.tar.gz git-211e6eb513f372ad79fecc3db19413b3573ae962.tar.xz | |
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>
Diffstat (limited to 'git-merge.sh')
| -rwxr-xr-x | git-merge.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge.sh b/git-merge.sh index 272f00462..efdbabf77 100755 --- a/git-merge.sh +++ b/git-merge.sh @@ -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 ." |