提交 211e6eb5 编写于 作者: J Junio C Hamano

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: NJunio C Hamano <junkio@cox.net>
上级 c0b7391b
......@@ -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 ."
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册