diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-10-25 17:11:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-10-25 17:11:34 -0700 |
| commit | 7f8a6caee563de5b1df31f698dfbe4b55a6b2bea (patch) | |
| tree | e4c45f15a9d08422a4187a1ee420d0e21dbe9f48 /sequencer.c | |
| parent | cf96b393d62df78fe1b19e599a026d2eef303828 (diff) | |
| parent | 3e367a5f2f53f19130b90a97c3e2668eca3461ae (diff) | |
| download | git-7f8a6caee563de5b1df31f698dfbe4b55a6b2bea.tar.gz | |
Merge branch 'ja/rebase-i-avoid-amending-self' into maint-2.38
"git rebase -i" can mistakenly attempt to apply a fixup to a commit
itself, which has been corrected.
* ja/rebase-i-avoid-amending-self:
sequencer: avoid dropping fixup commit that targets self via commit-ish
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sequencer.c b/sequencer.c index d26ede83c4..a4d85f1fbd 100644 --- a/sequencer.c +++ b/sequencer.c @@ -6203,8 +6203,6 @@ int todo_list_rearrange_squash(struct todo_list *todo_list) return error(_("the script was already rearranged.")); } - *commit_todo_item_at(&commit_todo, item->commit) = item; - parse_commit(item->commit); commit_buffer = logmsg_reencode(item->commit, NULL, "UTF-8"); find_commit_subject(commit_buffer, &subject); @@ -6271,6 +6269,8 @@ int todo_list_rearrange_squash(struct todo_list *todo_list) strhash(entry->subject)); hashmap_put(&subject2item, &entry->entry); } + + *commit_todo_item_at(&commit_todo, item->commit) = item; } if (rearranged) { |