From: Paolo Bonzini <bonzini@gnu.org>
Date: Tue, 5 Feb 2008 10:01:45 +0000 (+0100)
Subject: git-commit: set GIT_EDITOR=: if editor will not be launched
X-Git-Tag: v1.5.5-rc0~209^2~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=406400ce4f69e79b544dd3539a71b85d99331820;p=git.git

git-commit: set GIT_EDITOR=: if editor will not be launched

This is a preparatory patch that provides a simple way for the future
prepare-commit-msg hook to discover if the editor will be launched.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/Documentation/hooks.txt b/Documentation/hooks.txt
index f110162b0..e8d80cfcd 100644
--- a/Documentation/hooks.txt
+++ b/Documentation/hooks.txt
@@ -61,6 +61,10 @@ The default 'pre-commit' hook, when enabled, catches introduction
 of lines with trailing whitespaces and aborts the commit when
 such a line is found.
 
+All the `git-commit` hooks are invoked with the environment
+variable `GIT_EDITOR=:` if the command will not bring up an editor
+to modify the commit message.
+
 commit-msg
 ----------
 
diff --git a/builtin-commit.c b/builtin-commit.c
index ec00134f9..90ddbaebf 100644
--- a/builtin-commit.c
+++ b/builtin-commit.c
@@ -599,6 +599,8 @@ static int parse_and_validate_options(int argc, const char *argv[],
 		use_editor = 0;
 	if (edit_flag)
 		use_editor = 1;
+	if (!use_editor)
+		setenv("GIT_EDITOR", ":", 1);
 
 	if (get_sha1("HEAD", head_sha1))
 		initial_commit = 1;