From: Junio C Hamano <junkio@cox.net>
Date: Mon, 15 May 2006 07:51:37 +0000 (-0700)
Subject: Merge branch 'fix'
X-Git-Tag: v1.4.0-rc1~145
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/de1d4fa2a1273e09c32653c7a21602e36223348c?hp=15739c89fbf508c453da854ec50f313505bbe78f

Merge branch 'fix'

* fix:
Ensure author & committer before asking for commit message.
---

diff --git a/git-commit.sh b/git-commit.sh
index 26cd7ca54d..6ef1a9dedc 100755
--- a/git-commit.sh
+++ b/git-commit.sh
@@ -640,6 +640,8 @@ case "$no_edit" in
 		exit 1
 		;;
 	esac
+	git-var GIT_AUTHOR_IDENT > /dev/null  || die
+	git-var GIT_COMMITTER_IDENT > /dev/null  || die
 	${VISUAL:-${EDITOR:-vi}} "$GIT_DIR/COMMIT_EDITMSG"
 	;;
 esac