@matheusbsbs / matheus-bagliano / commits / c175161638
Fork 0

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

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

Junio C Hamano committed Nov 26, 2006 at 22:19 UTC c1751616381b6e8c8eae311107b5969a0233a6d8
1 file changed +1 -1
git-merge.sh
+1 -1
@@ -159,7 +159,7 @@ then
159 shift
160 head_arg="$1"
161 shift
162 -elif ! git-rev-parse --verify HEAD 2>/dev/null
162 +elif ! git-rev-parse --verify HEAD >/dev/null 2>&1
163 then
164 # If the merged head is a valid one there is no reason to
165 # forbid "git merge" into a branch yet to be born. We do