summaryrefslogtreecommitdiff
path: root/builtin-commit.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-01-17 16:00:07 -0800
committerJunio C Hamano <gitster@pobox.com>2010-01-17 16:00:07 -0800
commitf8eb50f60b5c8efda3529fcf89517080c686ce0b (patch)
treebc320ad67d4c6278f41c1beeff7d4884688133ff /builtin-commit.c
parenta4c3616b19700cc60e06096f59c4aae0e6635cfe (diff)
parentf9c01817bb7a0a7b61652ec8e3ac12c900526f0e (diff)
downloadgit-f8eb50f60b5c8efda3529fcf89517080c686ce0b.tar.gz
Merge branch 'jh/commit-status'
* jh/commit-status: t7502: test commit.status, --status and --no-status commit: support commit.status, --status, and --no-status Conflicts: Documentation/git-commit.txt builtin-commit.c
Diffstat (limited to 'builtin-commit.c')
-rw-r--r--builtin-commit.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/builtin-commit.c b/builtin-commit.c
index 592b10396d..e644871210 100644
--- a/builtin-commit.c
+++ b/builtin-commit.c
@@ -68,7 +68,7 @@ static enum {
} cleanup_mode;
static char *cleanup_arg;
-static int use_editor = 1, initial_commit, in_merge;
+static int use_editor = 1, initial_commit, in_merge, include_status = 1;
static const char *only_include_assumed;
static struct strbuf message;
@@ -107,6 +107,7 @@ static struct option builtin_commit_options[] = {
OPT_FILENAME('t', "template", &template_file, "use specified template file"),
OPT_BOOLEAN('e', "edit", &edit_flag, "force edit of commit"),
OPT_STRING(0, "cleanup", &cleanup_arg, "default", "how to strip spaces and #comments from message"),
+ OPT_BOOLEAN(0, "status", &include_status, "include status in commit message template"),
/* end commit message options */
OPT_GROUP("Commit contents options"),
@@ -590,7 +591,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
/* This checks if committer ident is explicitly given */
git_committer_info(0);
- if (use_editor) {
+ if (use_editor && include_status) {
char *author_ident;
const char *committer_ident;
@@ -1105,6 +1106,10 @@ static int git_commit_config(const char *k, const char *v, void *cb)
if (!strcmp(k, "commit.template"))
return git_config_pathname(&template_file, k, v);
+ if (!strcmp(k, "commit.status")) {
+ include_status = git_config_bool(k, v);
+ return 0;
+ }
return git_status_config(k, v, s);
}