From: Junio C Hamano <junkio@cox.net>
Date: Fri, 3 Mar 2006 05:13:24 +0000 (-0800)
Subject: git-commit: make sure we protect against races.
X-Git-Tag: v1.3.0-rc1~86
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b8310152bc5622e4d449e3113ba4edec8fd08087;p=git.git

git-commit: make sure we protect against races.

An earlier commit 8098a178b26dc7a158d129a092a5b78da6d12b72
accidentally lost race protection from git-commit command.
This commit reinstates it.  When something else updates HEAD
pointer while you were editing your commit message, the command
would notice and abort the commit.

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

diff --git a/git-commit.sh b/git-commit.sh
index c9c22abc5..d9ec1f14d 100755
--- a/git-commit.sh
+++ b/git-commit.sh
@@ -595,12 +595,14 @@ then
 		PARENTS=$(git-cat-file commit HEAD |
 			sed -n -e '/^$/q' -e 's/^parent /-p /p')
 	fi
+	current=$(git-rev-parse --verify HEAD)
 else
 	if [ -z "$(git-ls-files)" ]; then
 		echo >&2 Nothing to commit
 		exit 1
 	fi
 	PARENTS=""
+	current=
 fi
 
 {