diff options
author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2022-03-23 12:13:14 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-03-23 21:38:41 +0300 |
commit | 0f8878359207191195867ebd499abba3710f9f4b (patch) | |
tree | b5bed6f68cab32eaf402b155472da7621624458f /builtin/ls-tree.c | |
parent | cab851c2f8c190bed93719ca8c712fdfcc3c7182 (diff) |
ls-tree: detect and error on --name-only --name-status
The --name-only and --name-status options are synonyms, but let's
detect and error if both are provided.
In addition let's add explicit --format tests for the combination of
these various options.
Signed-off-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 'builtin/ls-tree.c')
-rw-r--r-- | builtin/ls-tree.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/builtin/ls-tree.c b/builtin/ls-tree.c index 3474f8c3d6..6550f27dfe 100644 --- a/builtin/ls-tree.c +++ b/builtin/ls-tree.c @@ -41,6 +41,7 @@ static enum ls_tree_cmdmode { MODE_DEFAULT = 0, MODE_LONG, MODE_NAME_ONLY, + MODE_NAME_STATUS, MODE_OBJECT_ONLY, } cmdmode; @@ -296,7 +297,7 @@ int cmd_ls_tree(int argc, const char **argv, const char *prefix) OPT_CMDMODE(0, "name-only", &cmdmode, N_("list only filenames"), MODE_NAME_ONLY), OPT_CMDMODE(0, "name-status", &cmdmode, N_("list only filenames"), - MODE_NAME_ONLY), + MODE_NAME_STATUS), OPT_CMDMODE(0, "object-only", &cmdmode, N_("list only objects"), MODE_OBJECT_ONLY), OPT_SET_INT(0, "full-name", &chomp_prefix, @@ -322,6 +323,14 @@ int cmd_ls_tree(int argc, const char **argv, const char *prefix) ls_tree_prefix = prefix = NULL; chomp_prefix = 0; } + /* + * We wanted to detect conflicts between --name-only and + * --name-status, but once we're done with that subsequent + * code should only need to check the primary name. + */ + if (cmdmode == MODE_NAME_STATUS) + cmdmode = MODE_NAME_ONLY; + /* -d -r should imply -t, but -d by itself should not have to. */ if ( (LS_TREE_ONLY|LS_RECURSIVE) == ((LS_TREE_ONLY|LS_RECURSIVE) & ls_options)) |