diff options
| author |  Teng Long <dyroneteng@gmail.com> | 2022-03-23 17:13:08 +0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2022-03-23 11:38:39 -0700 |
| commit | f6b224d5ebfe9fcf58ef34eddea68d9fb4384d50 (patch) | |
| tree | 8752ec76332ca8ff55234d24cfa6fe7ba1dc9c63 /t | |
| parent | ls-tree: simplify nesting if/else logic in "show_tree()" (diff) | |
| download | tgif-f6b224d5ebfe9fcf58ef34eddea68d9fb4384d50.tar.xz | |
ls-tree: fix "--name-only" and "--long" combined use bug
If we execute "git ls-tree" with combined "--name-only" and "--long"
, only the pathname will be printed, the size is omitted (the original
discoverer was Peff in [1]).
This commit fix this issue by using `OPT_CMDMODE()` instead to make both
of them mutually exclusive.
[1] https://public-inbox.org/git/YZK0MKCYAJmG+pSU@coredump.intra.peff.net/
Helped-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Teng Long <dyroneteng@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3103-ls-tree-misc.sh | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/t/t3103-ls-tree-misc.sh b/t/t3103-ls-tree-misc.sh index d18ba1bd84..d9d7fa932f 100755 --- a/t/t3103-ls-tree-misc.sh +++ b/t/t3103-ls-tree-misc.sh @@ -23,4 +23,13 @@ test_expect_success 'ls-tree fails with non-zero exit code on broken tree' ' test_must_fail git ls-tree -r HEAD ' +for opts in \ + "--name-only --long" \ + "--name-status --long" +do + test_expect_success "usage: incompatible options: $opts" ' + test_expect_code 129 git ls-tree $opts $tree + ' +done + test_done |