From: Junio C Hamano <junkio@cox.net>
Date: Mon, 27 Nov 2006 06:19:42 +0000 (-0800)
Subject: git-merge: do not leak rev-parse output used for checking internally.
X-Git-Tag: v1.5.0-rc0~214^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c1751616381b6e8c8eae311107b5969a0233a6d8;p=git.git

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

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/git-merge.sh b/git-merge.sh
index 5fa8b0d57..75af10d3e 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -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