git-check-attr: Error out if no pathnames are specified

If no pathnames are passed as command-line arguments and the --stdin
option is not specified, fail with the error message "No file
specified".  Add tests of this behavior.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/check-attr.c b/builtin/check-attr.c
index e9b827ffb58f10d3cdcb73e45e332e34ae2b47ed..6cf6421399644b359e08ea84493de419c71bc941 100644 (file)
--- a/builtin/check-attr.c
+++ b/builtin/check-attr.c
@@ -111,8 +111,13 @@ int cmd_check_attr(int argc, const char **argv, const char *prefix)
        }
 
        /* Check file argument(s): */
-       if (stdin_paths && filei < argc)
-               error_with_usage("Can't specify files with --stdin");
+       if (stdin_paths) {
+               if (filei < argc)
+                       error_with_usage("Can't specify files with --stdin");
+       } else {
+               if (filei >= argc)
+                       error_with_usage("No file specified");
+       }
 
        check = xcalloc(cnt, sizeof(*check));
        for (i = 0; i < cnt; i++) {

diff --git a/t/t0003-attributes.sh b/t/t0003-attributes.sh
index f1debeb7ad872a501f11c951a1312bc8901b5e49..22540051d8db357379a7512a7d4c4e875227fe2e 100755 (executable)
--- a/t/t0003-attributes.sh
+++ b/t/t0003-attributes.sh
@@ -46,6 +46,8 @@ test_expect_success 'command line checks' '
 
        test_must_fail git check-attr &&
        test_must_fail git check-attr -- &&
+       test_must_fail git check-attr test &&
+       test_must_fail git check-attr test -- &&
        test_must_fail git check-attr -- f &&
        echo "f" | test_must_fail git check-attr --stdin &&
        echo "f" | test_must_fail git check-attr --stdin -- f &&