diff options
| author | Johannes Sixt <j6t@kdbg.org> | 2025-08-06 19:38:35 +0200 | 
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-08-06 11:49:35 -0700 | 
| commit | 4d491ade8f6597904a7b79ff5d34f8524f915ac2 (patch) | |
| tree | cf38fbe433d59e2a27c10f4193458e19f59af495 /t/unit-tests | |
| parent | a1cf0cf13ab3a659ac77b7d749d6e5b11dc0142b (diff) | |
rebase -i: permit 'drop' of a merge commit
4c063c82e9 (rebase -i: improve error message when picking merge,
2024-05-30) added advice texts for cases when a merge commit is
passed as argument of sequencer command that cannot operate with
a merge commit. However, it forgot about the 'drop' command, so
that in this case the BUG() in the default branch is reached.
Handle 'drop' like 'merge', i.e., permit it without a message.
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/unit-tests')
0 files changed, 0 insertions, 0 deletions
