Revision 9a1b7474d6babad5fabed9a2926a57d875f3820b authored by Elijah Newren on 11 March 2020, 15:30:22 UTC, committed by Junio C Hamano on 11 March 2020, 19:11:05 UTC
In commit e98c4269c8 ("rebase (interactive-backend): fix handling of commits that become empty", 2020-02-15), the merge backend was changed to drop commits that did not start empty but became so after being applied (because their changes were a subset of what was already upstream). This new code path did not need to go through the process of creating a commit, since we were dropping the commit instead. Unfortunately, this also means we bypassed the clearing of the CHERRY_PICK_HEAD and MERGE_MSG files, which if there were no further commits to cherry-pick would mean that the rebase would end but assume there was still an operation in progress. Ensure that we clear such state files when we decide to drop the commit. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 937d143
File | Mode | Size |
---|---|---|
tr2_cfg.c | -rw-r--r-- | 2.0 KB |
tr2_cfg.h | -rw-r--r-- | 468 bytes |
tr2_cmd_name.c | -rw-r--r-- | 728 bytes |
tr2_cmd_name.h | -rw-r--r-- | 660 bytes |
tr2_dst.c | -rw-r--r-- | 9.8 KB |
tr2_dst.h | -rw-r--r-- | 857 bytes |
tr2_sid.c | -rw-r--r-- | 2.9 KB |
tr2_sid.h | -rw-r--r-- | 362 bytes |
tr2_sysenv.c | -rw-r--r-- | 3.6 KB |
tr2_sysenv.h | -rw-r--r-- | 834 bytes |
tr2_tbuf.c | -rw-r--r-- | 1.0 KB |
tr2_tbuf.h | -rw-r--r-- | 509 bytes |
tr2_tgt.h | -rw-r--r-- | 5.2 KB |
tr2_tgt_event.c | -rw-r--r-- | 16.6 KB |
tr2_tgt_normal.c | -rw-r--r-- | 8.3 KB |
tr2_tgt_perf.c | -rw-r--r-- | 14.7 KB |
tr2_tls.c | -rw-r--r-- | 4.0 KB |
tr2_tls.h | -rw-r--r-- | 2.3 KB |
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...