undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'cc/maint-commit-reflog-msg' into maint

Browse Source 
* cc/maint-commit-reflog-msg:
  commit: use value of GIT_REFLOG_ACTION env variable as reflog message
This commit is contained in:
Junio C Hamano 2010-06-22 09:31:48 -07:00
commit 81b43b54b2
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
builtin/commit.c
View File

@ -1252,13 +1252,16 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
} }
/* Determine parents */ /* Determine parents */
reflog_msg = getenv("GIT_REFLOG_ACTION");
if (initial_commit) { if (initial_commit) {
reflog_msg = "commit (initial)"; if (!reflog_msg)
reflog_msg = "commit (initial)";
} else if (amend) { } else if (amend) {
struct commit_list *c; struct commit_list *c;
struct commit *commit; struct commit *commit;
reflog_msg = "commit (amend)"; if (!reflog_msg)
reflog_msg = "commit (amend)";
commit = lookup_commit(head_sha1); commit = lookup_commit(head_sha1);
if (!commit || parse_commit(commit)) if (!commit || parse_commit(commit))
die("could not parse HEAD commit"); die("could not parse HEAD commit");
@ -1269,7 +1272,8 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
struct strbuf m = STRBUF_INIT; struct strbuf m = STRBUF_INIT;
FILE *fp; FILE *fp;
reflog_msg = "commit (merge)"; if (!reflog_msg)
reflog_msg = "commit (merge)";
pptr = &commit_list_insert(lookup_commit(head_sha1), pptr)->next; pptr = &commit_list_insert(lookup_commit(head_sha1), pptr)->next;
fp = fopen(git_path("MERGE_HEAD"), "r"); fp = fopen(git_path("MERGE_HEAD"), "r");
if (fp == NULL) if (fp == NULL)
@ -1292,7 +1296,8 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
if (allow_fast_forward) if (allow_fast_forward)
parents = reduce_heads(parents); parents = reduce_heads(parents);
} else { } else {
reflog_msg = "commit"; if (!reflog_msg)
reflog_msg = "commit";
pptr = &commit_list_insert(lookup_commit(head_sha1), pptr)->next; pptr = &commit_list_insert(lookup_commit(head_sha1), pptr)->next;
} }

6
t/t3501-revert-cherry-pick.sh
View File

@ -47,7 +47,8 @@ test_expect_success 'cherry-pick after renaming branch' '
git cherry-pick added && git cherry-pick added &&
test $(git rev-parse HEAD^) = $(git rev-parse rename2) && test $(git rev-parse HEAD^) = $(git rev-parse rename2) &&
test -f opos && test -f opos &&
grep "Add extra line at the end" opos grep "Add extra line at the end" opos &&
git reflog -1 | grep cherry-pick
' '
@ -57,7 +58,8 @@ test_expect_success 'revert after renaming branch' '
git revert added && git revert added &&
test $(git rev-parse HEAD^) = $(git rev-parse rename1) && test $(git rev-parse HEAD^) = $(git rev-parse rename1) &&
test -f spoo && test -f spoo &&
! grep "Add extra line at the end" spoo ! grep "Add extra line at the end" spoo &&
git reflog -1 | grep revert
' '