| commit | 211e6eb513f372ad79fecc3db19413b3573ae962 | |
| author | Junio C Hamano <junkio@cox.net> | |
| Wed, 6 Dec 2006 18:52:04 +0000 (6 10:52 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Wed, 6 Dec 2006 18:52:04 +0000 (6 10:52 -0800) | ||
| tree | 0425cf69ba0b88f4e332d61ec3f749d5e4be9705 | treesnapshot (tar.gz zip) |
| parent | c0b7391bf5dd314523b8c6ea29ffafc8769f2eb1 | commitdiff |
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>
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>
| git-merge.sh | diffblobblamehistory |