diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-06-21 06:02:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-21 06:02:50 -0700 |
| commit | 6cd52edbbd9acc7797cffeba1b849538285ed558 (patch) | |
| tree | b82aef1e68cc1f4987976169b06d53334fc79ed4 /builtin/commit.c | |
| parent | 9cb16a92d7c069b36f7b7b08557f779de499d3f7 (diff) | |
| parent | 643cb5f7c99e77a4a3e97213dd226a7dc2650c02 (diff) | |
| download | git-6cd52edbbd9acc7797cffeba1b849538285ed558.tar.gz git-6cd52edbbd9acc7797cffeba1b849538285ed558.tar.xz | |
Merge branch 'cc/maint-commit-reflog-msg'
* cc/maint-commit-reflog-msg:
commit: use value of GIT_REFLOG_ACTION env variable as reflog message
Diffstat (limited to 'builtin/commit.c')
| -rw-r--r-- | builtin/commit.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index 5e4f0f33b..3d99cf915 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -1267,13 +1267,16 @@ int cmd_commit(int argc, const char **argv, const char *prefix) } /* Determine parents */ + reflog_msg = getenv("GIT_REFLOG_ACTION"); if (initial_commit) { - reflog_msg = "commit (initial)"; + if (!reflog_msg) + reflog_msg = "commit (initial)"; } else if (amend) { struct commit_list *c; struct commit *commit; - reflog_msg = "commit (amend)"; + if (!reflog_msg) + reflog_msg = "commit (amend)"; commit = lookup_commit(head_sha1); if (!commit || parse_commit(commit)) die("could not parse HEAD commit"); @@ -1284,7 +1287,8 @@ int cmd_commit(int argc, const char **argv, const char *prefix) struct strbuf m = STRBUF_INIT; FILE *fp; - reflog_msg = "commit (merge)"; + if (!reflog_msg) + reflog_msg = "commit (merge)"; pptr = &commit_list_insert(lookup_commit(head_sha1), pptr)->next; fp = fopen(git_path("MERGE_HEAD"), "r"); if (fp == NULL) @@ -1307,7 +1311,8 @@ int cmd_commit(int argc, const char **argv, const char *prefix) if (allow_fast_forward) parents = reduce_heads(parents); } else { - reflog_msg = "commit"; + if (!reflog_msg) + reflog_msg = "commit"; pptr = &commit_list_insert(lookup_commit(head_sha1), pptr)->next; } |