summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Bonzini <bonzini@gnu.org>2008-02-05 10:01:45 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-02-06 10:26:02 (GMT)
commit406400ce4f69e79b544dd3539a71b85d99331820 (patch)
treeba11111ec74340689bc94ec0689dd628852dfdce
parent3473f3035d04957ca24d3ccc232f4263b26d6bb8 (diff)
downloadgit-406400ce4f69e79b544dd3539a71b85d99331820.zip
git-406400ce4f69e79b544dd3539a71b85d99331820.tar.gz
git-406400ce4f69e79b544dd3539a71b85d99331820.tar.bz2
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>
-rw-r--r--Documentation/hooks.txt4
-rw-r--r--builtin-commit.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/hooks.txt b/Documentation/hooks.txt
index f110162..e8d80cf 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 ec00134..90ddbae 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;