aboutsummaryrefslogtreecommitdiff
path: root/git-merge.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-11-26 22:19:42 -0800
committerJunio C Hamano <junkio@cox.net>2006-11-26 22:19:42 -0800
commitc1751616381b6e8c8eae311107b5969a0233a6d8 (patch)
tree0f0b6f88f8dc0f2144de7613fa19c125a8089dc8 /git-merge.sh
parent51901e96bf592877f7b266d0d9c6cb83b363edce (diff)
downloadgit-c1751616381b6e8c8eae311107b5969a0233a6d8.tar.gz
git-c1751616381b6e8c8eae311107b5969a0233a6d8.tar.xz
git-merge: do not leak rev-parse output used for checking internally.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge.sh')
-rwxr-xr-xgit-merge.sh2
1 files changed, 1 insertions, 1 deletions
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