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>

diff --git a/builtin/ls-tree.c b/builtin/ls-tree.c
index 3474f8c3d62d3d74e09fc922ac49da1e72430d70..6550f27dfe3ae4e64a5ecf12bb127da8462d622e 100644 (file)
--- 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))

diff --git a/t/t3103-ls-tree-misc.sh b/t/t3103-ls-tree-misc.sh
index d979c0df5d345807cc22eb4d3f99ef6f43f4886b..81c6343962381fc17b1bff4d3ca8958951bde70d 100755 (executable)
--- a/t/t3103-ls-tree-misc.sh
+++ b/t/t3103-ls-tree-misc.sh
@@ -24,15 +24,18 @@ test_expect_success 'ls-tree fails with non-zero exit code on broken tree' '
 '
 
 for opts in \
-       "--name-only --long" \
-       "--name-status --long" \
-       "--name-only --object-only" \
+       "--long --name-only" \
+       "--name-only --name-status" \
        "--name-status --object-only" \
-       "--object-only --long" \
-       "--object-only --format"
+       "--object-only --long"
 do
        test_expect_success "usage: incompatible options: $opts" '
                test_expect_code 129 git ls-tree $opts $tree
-    '
+       '
+
+       one_opt=$(echo "$opts" | cut -d' '  -f1)
+       test_expect_success "usage: incompatible options: $one_opt and --format" '
+               test_expect_code 129 git ls-tree $one_opt --format=fmt $tree
+       '
 done
 test_done