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>
Junio C Hamano committed
Dec 6, 2006 at 10:52 UTC
211e6eb513f372ad79fecc3db19413b3573ae962
1 file changed
+1
-1
git-merge.sh
+1
-1
@@ -189,7 +189,7 @@ else
189
merge_name=$(for remote
190
do
191
rh=$(git-rev-parse --verify "$remote"^0 2>/dev/null) &&
192
- bh=$(git show-ref -s --verify "refs/heads/$remote") &&
192
+ bh=$(git show-ref -s --verify "refs/heads/$remote" 2>/dev/null) &&
193
if test "$rh" = "$bh"
194
then
195
echo "$rh branch '$remote' of ."