mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'cc/maint-commit-reflog-msg'
* cc/maint-commit-reflog-msg: commit: use value of GIT_REFLOG_ACTION env variable as reflog message
This commit is contained in:
commit
6cd52edbbd
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -47,7 +47,8 @@ test_expect_success 'cherry-pick after renaming branch' '
|
|||
git cherry-pick added &&
|
||||
test $(git rev-parse HEAD^) = $(git rev-parse rename2) &&
|
||||
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 &&
|
||||
test $(git rev-parse HEAD^) = $(git rev-parse rename1) &&
|
||||
test -f spoo &&
|
||||
! grep "Add extra line at the end" spoo
|
||||
! grep "Add extra line at the end" spoo &&
|
||||
git reflog -1 | grep revert
|
||||
|
||||
'
|
||||
|
||||
|
|
Loading…
Reference in a new issue