rebase: mark --update-refs as requiring the merge backend
--update-refs is built in terms of the sequencer, which requires the merge backend. It was already marked as incompatible with the apply backend in the git-rebase manual, but the code didn't check for this incompatibility and warn the user. Check and error now. While at it, fix a typo in t3422...and fix some misleading wording (most options which used to be am-specific have since been implemented in the merge backend as well). Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Elijah Newren committed
Jan 25, 2023 at 04:03 UTC
1207599e839bd9311ec506d82cd507e820767e9b
3 files changed
+15
-5
Documentation/git-rebase.txt
+2
@@ -630,6 +630,8 @@ start would be overridden by the presence of
630
+
631
If the configuration variable `rebase.updateRefs` is set, then this option
632
can be used to override and disable this setting.
633
++
634
+See also INCOMPATIBLE OPTIONS below.
635
636
INCOMPATIBLE OPTIONS
637
--------------------
builtin/rebase.c
+3
@@ -1492,6 +1492,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
1492
}
1493
}
1494
1495
+ if (options.update_refs)
1496
+ imply_merge(&options, "--update-refs");
1497
+
1498
if (options.type == REBASE_UNSPECIFIED) {
1499
if (!strcmp(options.default_backend, "merge"))
1500
imply_merge(&options, "--merge");
t/t3422-rebase-incompatible-options.sh
+10
-5
@@ -25,11 +25,11 @@ test_expect_success 'setup' '
25
'
26
27
#
28
-# Rebase has lots of useful options like --whitepsace=fix, which are
29
-# actually all built in terms of flags to git-am. Since neither
30
-# --merge nor --interactive (nor any options that imply those two) use
31
-# git-am, using them together will result in flags like --whitespace=fix
32
-# being ignored. Make sure rebase warns the user and aborts instead.
28
+# Rebase has a couple options which are specific to the apply backend,
29
+# and several options which are specific to the merge backend. Flags
30
+# from the different sets cannot work together, and we do not want to
31
+# just ignore one of the sets of flags. Make sure rebase warns the
32
+# user and aborts instead.
33
#
34
35
test_rebase_am_only () {
@@ -60,6 +60,11 @@ test_rebase_am_only () {
60
test_must_fail git rebase $opt --exec 'true' A
61
"
62
63
+ test_expect_success "$opt incompatible with --update-refs" "
64
+ git checkout B^0 &&
65
+ test_must_fail git rebase $opt --update-refs A
66
+ "
67
+
68
}
69
70
test_rebase_am_only --whitespace=fix