| commit | c1751616381b6e8c8eae311107b5969a0233a6d8 | [log] [tgz] |
|---|---|---|
| author | Junio C Hamano <junkio@cox.net> | Sun Nov 26 22:19:42 2006 -0800 |
| committer | Junio C Hamano <junkio@cox.net> | Sun Nov 26 22:19:42 2006 -0800 |
| tree | 0f0b6f88f8dc0f2144de7613fa19c125a8089dc8 | |
| parent | 51901e96bf592877f7b266d0d9c6cb83b363edce [diff] [blame] |
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 5fa8b0d..75af10d 100755 --- a/git-merge.sh +++ b/git-merge.sh
@@ -159,7 +159,7 @@ 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