global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-04-10 17:00:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

rebase: flag --apply and --merge as incompatible

Browse Source 
Previously, we flagged options which implied --apply as being
incompatible with options which implied --merge.  But if both options
were given explicitly, then we didn't flag the incompatibility.  The
same is true with --apply and --interactive.  Add the check, and add
some testcases to verify these are also caught.

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:46 +00:00
committed by Junio C Hamano
parent 1207599e83
commit 7d718c552b
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -67,7 +67,10 @@ test_rebase_am_only () {
}
# Check options which imply --apply
test_rebase_am_only --whitespace=fix
test_rebase_am_only -C4
# Also check an explicit --apply
test_rebase_am_only --apply
test_done