undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rebase: fix incompatiblity checks for --[no-]reapply-cherry-picks

Browse Source 
--[no-]reapply-cherry-picks was traditionally only supported by the
sequencer.  Support was added for the apply backend, when --keep-base is
also specified, in commit ce5238a690 ("rebase --keep-base: imply
--reapply-cherry-picks", 2022-10-17).  Make the code error out when
--[no-]reapply-cherry-picks is specified AND the apply backend is used
AND --keep-base is not specified.  Also, clarify a number of comments
surrounding the interaction of these flags.

Helped-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Elijah Newren 2023-01-25 04:03:49 +00:00 committed by Junio C Hamano
parent b8ad365640
commit ffeaca177a
3 changed files with 32 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/git-rebase.txt
View File

@ -650,7 +650,7 @@ are incompatible with the following options:
* --exec * --exec
* --no-keep-empty * --no-keep-empty
* --empty= * --empty=
* --reapply-cherry-picks * --[no-]reapply-cherry-picks when used without --keep-base
* --edit-todo * --edit-todo
* --update-refs * --update-refs
* --root when used without --onto * --root when used without --onto

34
builtin/rebase.c
View File

@ -1224,13 +1224,6 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
if (options.fork_point < 0) if (options.fork_point < 0)
options.fork_point = 0; options.fork_point = 0;
} }
/*
* --keep-base defaults to --reapply-cherry-picks to avoid losing
* commits when using this option.
*/
if (options.reapply_cherry_picks < 0)
options.reapply_cherry_picks = keep_base;
if (options.root && options.fork_point > 0) if (options.root && options.fork_point > 0)
die(_("options '%s' and '%s' cannot be used together"), "--root", "--fork-point"); die(_("options '%s' and '%s' cannot be used together"), "--root", "--fork-point");
@ -1406,12 +1399,27 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
if (options.empty != EMPTY_UNSPECIFIED) if (options.empty != EMPTY_UNSPECIFIED)
imply_merge(&options, "--empty"); imply_merge(&options, "--empty");
/* if (options.reapply_cherry_picks < 0)
* --keep-base implements --reapply-cherry-picks by altering upstream so /*
* it works with both backends. * We default to --no-reapply-cherry-picks unless
*/ * --keep-base is given; when --keep-base is given, we want
if (options.reapply_cherry_picks && !keep_base) * to default to --reapply-cherry-picks.
imply_merge(&options, "--reapply-cherry-picks"); */
options.reapply_cherry_picks = keep_base;
else if (!keep_base)
/*
* The apply backend always searches for and drops cherry
* picks. This is often not wanted with --keep-base, so
* --keep-base allows --reapply-cherry-picks to be
* simulated by altering the upstream such that
* cherry-picks cannot be detected and thus all commits are
* reapplied. Thus, --[no-]reapply-cherry-picks is
* supported when --keep-base is specified, but not when
* --keep-base is left out.
*/
imply_merge(&options, options.reapply_cherry_picks ?
"--reapply-cherry-picks" :
"--no-reapply-cherry-picks");
if (gpg_sign) if (gpg_sign)
options.gpg_sign_opt = xstrfmt("-S%s", gpg_sign); options.gpg_sign_opt = xstrfmt("-S%s", gpg_sign);

10
t/t3422-rebase-incompatible-options.sh
View File

@ -60,6 +60,16 @@ test_rebase_am_only () {
test_must_fail git rebase $opt --exec 'true' A test_must_fail git rebase $opt --exec 'true' A
" "
test_expect_success "$opt incompatible with --no-reapply-cherry-picks" "
git checkout B^0 &&
test_must_fail git rebase $opt --no-reapply-cherry-picks A
"
test_expect_success "$opt incompatible with --reapply-cherry-picks" "
git checkout B^0 &&
test_must_fail git rebase $opt --reapply-cherry-picks A
"
test_expect_success "$opt incompatible with --update-refs" " test_expect_success "$opt incompatible with --update-refs" "
git checkout B^0 && git checkout B^0 &&
test_must_fail git rebase $opt --update-refs A test_must_fail git rebase $opt --update-refs A