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

git-merge: do not leak rev-parse output used for checking internally.

Signed-off-by: NJunio C Hamano <junkio@cox.net>
上级 51901e96
......@@ -159,7 +159,7 @@ then
shift
head_arg="$1"
shift
elif ! git-rev-parse --verify HEAD 2>/dev/null
elif ! git-rev-parse --verify HEAD >/dev/null 2>&1
then
# If the merged head is a valid one there is no reason to
# forbid "git merge" into a branch yet to be born. We do
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册