From: Sean Date: Sun, 14 May 2006 03:09:32 GMT Subject: [PATCH] Ensure author & committer before asking for commit message. Message-ID: In-Reply-To: <7vlkt5s4yw.fsf@assigned-by-dhcp.cox.net> It's better to find out you need to fix your author and committer information before you enter a long commit message. Signed-off-by: Sean Estabrooks --- On Sat, 13 May 2006 19:41:27 -0700 Junio C Hamano wrote: > Makes sense but I suspect you would want COMMITTER not AUTHOR. > Imagine you pulled from somewhere else and it conflicted, > requiring you to hand resolve and then run git-commit. Hmm.. It seems that both sets of environment variables must be properly set before commit will succeed? For some reason I thought that if AUTHOR was properly set it would be used as the committer too when the GIT_COMMITTER_* environment variables weren't set. All I ever use are the config user.email/name variables which do work for both author and committer. But it looks like we have to test both variables before proceeding. git-commit.sh | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) 801ac3c2e4ec7fd0dd91975800897f30938b4e68 diff --git a/git-commit.sh b/git-commit.sh index 26cd7ca..6ef1a9d 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 -- 1.3.2.gd9a4