path: root/t/
diff options
authorÆvar Arnfjörð Bjarmason <>2017-03-21 12:58:49 (GMT)
committerJunio C Hamano <>2017-03-21 18:19:52 (GMT)
commit17d6c744dc0d5ed4cd0f228da14239ea2654f05b (patch)
treef79f6b944636060af6bad10e05f5ab267359b34b /t/
parent8881d35cace41604dba72c1b6b5ab5a59e0c2b94 (diff)
ref-filter: make combining --merged & --no-merged an error
Change the behavior of specifying --merged & --no-merged to be an error, instead of silently picking the option that was provided last. Subsequent changes of mine add a --no-contains option in addition to the existing --contains. Providing both of those isn't an error, and has actual meaning. Making its cousins have different behavior in this regard would be confusing to the user, especially since we'd be silently disregarding some of their command-line input. Signed-off-by: Ævar Arnfjörð Bjarmason <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 't/')
1 files changed, 4 insertions, 0 deletions
diff --git a/t/ b/t/
index e36ed3b..f286f39 100755
--- a/t/
+++ b/t/
@@ -953,6 +953,10 @@ test_expect_success '--merged catches invalid object names' '
test_must_fail git branch --merged 0000000000000000000000000000000000000000
+test_expect_success '--merged is incompatible with --no-merged' '
+ test_must_fail git branch --merged HEAD --no-merged HEAD
test_expect_success 'tracking with unexpected .fetch refspec' '
rm -rf a b c d &&
git init a &&