diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@gmx.de> | 2023-10-20 11:36:52 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-10-20 14:47:43 -0700 |
| commit | a5b5740bf63cd435fb172b12aa97176f13ff3fd3 (patch) | |
| tree | 1aaebfa04b376e694c344f1e009a39c715719938 /t/unit-tests/t-prio-queue.c | |
| parent | 813d9a91884e0afecec8ccf8e33909c405ee1d3f (diff) | |
rebase: simplify code related to imply_merge()
The code's evolution left in some bits surrounding enum rebase_type that
don't really make sense any more. In particular, it makes no sense to
invoke imply_merge() if the type is already known not to be
REBASE_APPLY, and it makes no sense to assign the type after calling
imply_merge().
enum rebase_type had more values until commit a74b35081c ("rebase: drop
support for `--preserve-merges`") and commit 10cdb9f38a ("rebase: rename
the two primary rebase backends"). The latter commit also renamed
imply_interactive() to imply_merge().
Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/unit-tests/t-prio-queue.c')
0 files changed, 0 insertions, 0 deletions
