diff options
author | Elijah Newren <newren@gmail.com> | 2023-01-25 04:03:48 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2023-01-25 17:20:53 (GMT) |
commit | b8ad365640192706e6742f47302e69e7aea62faf (patch) | |
tree | 1cf46c07c6146bedfa1ede1d43a9b9b92bf4dbca /t/t3422-rebase-incompatible-options.sh | |
parent | 1a66d8c6f658051a02b6d8f024e80e06fccdcd11 (diff) | |
download | git-b8ad365640192706e6742f47302e69e7aea62faf.zip git-b8ad365640192706e6742f47302e69e7aea62faf.tar.gz git-b8ad365640192706e6742f47302e69e7aea62faf.tar.bz2 |
rebase: fix docs about incompatibilities with --root
In commit 5dacd4abdd ("git-rebase.txt: document incompatible options",
2018-06-25), I added notes about incompatibilities between options for
the apply and merge backends. Unfortunately, I inverted the condition
when --root was incompatible with the apply backend. Fix the
documentation, and add a testcase that verifies the documentation
matches the code.
While at it, the documentation for --root also tried to cover some of
the backend differences between the apply and merge backends in relation
to reapplying cherry picks. The information:
* assumed that the apply backend was the default (it isn't anymore)
* was written before --reapply-cherry-picks became an option
* was written before the detailed information on backend differences
All of these factors make the sentence under --root about reapplying
cherry picks contradict information that is now available elsewhere in
the manual, and the other references are correct. So just strike this
sentence.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3422-rebase-incompatible-options.sh')
-rwxr-xr-x | t/t3422-rebase-incompatible-options.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/t/t3422-rebase-incompatible-options.sh b/t/t3422-rebase-incompatible-options.sh index 9b9e784..f862749 100755 --- a/t/t3422-rebase-incompatible-options.sh +++ b/t/t3422-rebase-incompatible-options.sh @@ -65,6 +65,10 @@ test_rebase_am_only () { test_must_fail git rebase $opt --update-refs A " + test_expect_success "$opt incompatible with --root without --onto" " + git checkout B^0 && + test_must_fail git rebase $opt --root A + " } # Check options which imply --apply |