mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-09-30 13:42:06 +02:00
Code

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

Browse Source 
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2006-11-26 22:19:42 -08:00
parent 51901e96bf
commit c175161638
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-merge.sh
View File

@ -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