kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'pw/rebase-i-cleanup-fix' into maint-2.51 

"git rebase -i" failed to clean-up the commit log message when the
command commits the final one in a chain of "fixup" commands, which
has been corrected.

* pw/rebase-i-cleanup-fix:
  sequencer: remove VERBATIM_MSG flag
  rebase -i: respect commit.cleanup when picking fixups
maint
Junio C Hamano 2025-10-15 10:29:31 -07:00
parent b3c96ce08f 82a0a73e15
commit ac57c870aa
2 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sequencer.c
View File

@ -1087,7 +1087,6 @@ N_("you have staged changes in your working tree\n"
#define CLEANUP_MSG (1<<3) #define CLEANUP_MSG (1<<3)
#define VERIFY_MSG (1<<4) #define VERIFY_MSG (1<<4)
#define CREATE_ROOT_COMMIT (1<<5) #define CREATE_ROOT_COMMIT (1<<5)
#define VERBATIM_MSG (1<<6)


static int run_command_silent_on_success(struct child_process *cmd) static int run_command_silent_on_success(struct child_process *cmd)
{ {
@ -1125,9 +1124,6 @@ static int run_git_commit(const char *defmsg,
{ {
struct child_process cmd = CHILD_PROCESS_INIT; struct child_process cmd = CHILD_PROCESS_INIT;


if ((flags & CLEANUP_MSG) && (flags & VERBATIM_MSG))
BUG("CLEANUP_MSG and VERBATIM_MSG are mutually exclusive");

cmd.git_cmd = 1; cmd.git_cmd = 1;


if (is_rebase_i(opts) && if (is_rebase_i(opts) &&
@ -1166,8 +1162,6 @@ static int run_git_commit(const char *defmsg,
strvec_pushl(&cmd.args, "-C", "HEAD", NULL); strvec_pushl(&cmd.args, "-C", "HEAD", NULL);
if ((flags & CLEANUP_MSG)) if ((flags & CLEANUP_MSG))
strvec_push(&cmd.args, "--cleanup=strip"); strvec_push(&cmd.args, "--cleanup=strip");
if ((flags & VERBATIM_MSG))
strvec_push(&cmd.args, "--cleanup=verbatim");
if ((flags & EDIT_MSG)) if ((flags & EDIT_MSG))
strvec_push(&cmd.args, "-e"); strvec_push(&cmd.args, "-e");
else if (!(flags & CLEANUP_MSG) && else if (!(flags & CLEANUP_MSG) &&
@ -1540,9 +1534,6 @@ static int try_to_commit(struct repository *r,
enum commit_msg_cleanup_mode cleanup; enum commit_msg_cleanup_mode cleanup;
int res = 0; int res = 0;


if ((flags & CLEANUP_MSG) && (flags & VERBATIM_MSG))
BUG("CLEANUP_MSG and VERBATIM_MSG are mutually exclusive");

if (parse_head(r, &current_head)) if (parse_head(r, &current_head))
return -1; return -1;


@ -1618,8 +1609,6 @@ static int try_to_commit(struct repository *r,


if (flags & CLEANUP_MSG) if (flags & CLEANUP_MSG)
cleanup = COMMIT_MSG_CLEANUP_ALL; cleanup = COMMIT_MSG_CLEANUP_ALL;
else if (flags & VERBATIM_MSG)
cleanup = COMMIT_MSG_CLEANUP_NONE;
else if ((opts->signoff || opts->record_origin) && else if ((opts->signoff || opts->record_origin) &&
!opts->explicit_cleanup) !opts->explicit_cleanup)
cleanup = COMMIT_MSG_CLEANUP_SPACE; cleanup = COMMIT_MSG_CLEANUP_SPACE;
@ -2436,7 +2425,6 @@ static int do_pick_commit(struct repository *r,
if (!final_fixup) if (!final_fixup)
msg_file = rebase_path_squash_msg(); msg_file = rebase_path_squash_msg();
else if (file_exists(rebase_path_fixup_msg())) { else if (file_exists(rebase_path_fixup_msg())) {
flags |= VERBATIM_MSG;
msg_file = rebase_path_fixup_msg(); msg_file = rebase_path_fixup_msg();
} else { } else {
const char *dest = git_path_squash_msg(r); const char *dest = git_path_squash_msg(r);

28
t/t3415-rebase-autosquash.sh
View File

@ -486,12 +486,28 @@ test_expect_success 'fixup a fixup' '
test XZWY = $(git show | tr -cd W-Z) test XZWY = $(git show | tr -cd W-Z)
' '


test_expect_success 'fixup does not clean up commit message' ' test_expect_success 'pick and fixup respect commit.cleanup' '
oneline="#818" && git reset --hard base &&
git commit --allow-empty -m "$oneline" && test_commit --no-tag "fixup! second commit" file1 fixup &&
git commit --fixup HEAD --allow-empty && test_commit something &&
git -c commit.cleanup=strip rebase -ki --autosquash HEAD~2 && write_script .git/hooks/prepare-commit-msg <<-\EOF &&
test "$oneline" = "$(git show -s --format=%s)" printf "\n# Prepared\n" >> "$1"
EOF
git rebase -i --autosquash HEAD~3 &&
test_commit_message HEAD~1 <<-\EOF &&
second commit

# Prepared
EOF
test_commit_message HEAD <<-\EOF &&
something

# Prepared
EOF
git reset --hard something &&
git -c commit.cleanup=strip rebase -i --autosquash HEAD~3 &&
test_commit_message HEAD~1 -m "second commit" &&
test_commit_message HEAD -m "something"
' '


test_done test_done