diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2017-03-21 12:58:49 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-03-21 11:19:52 -0700 |
| commit | 17d6c744dc0d5ed4cd0f228da14239ea2654f05b (patch) | |
| tree | f79f6b944636060af6bad10e05f5ab267359b34b /t/t3200-branch.sh | |
| parent | 8881d35cace41604dba72c1b6b5ab5a59e0c2b94 (diff) | |
| download | git-17d6c744dc0d5ed4cd0f228da14239ea2654f05b.tar.gz git-17d6c744dc0d5ed4cd0f228da14239ea2654f05b.tar.xz | |
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 <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3200-branch.sh')
| -rwxr-xr-x | t/t3200-branch.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index e36ed3b4e..f286f39b4 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -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 && |