aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Haggerty <mhagger@alum.mit.edu>2011-08-04 06:36:29 +0200
committerJunio C Hamano <gitster@pobox.com>2011-08-04 15:53:19 -0700
commitfdf6be8259fc59fc251b325f66e86df0fe905e79 (patch)
tree8c15c88e07bbed40cc1b1db6fab25bcddda6f9b4
parent72541040c3ed00084344de5bf75cbc5a514504bb (diff)
downloadgit-fdf6be8259fc59fc251b325f66e86df0fe905e79.tar.gz
git-fdf6be8259fc59fc251b325f66e86df0fe905e79.tar.xz
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>
-rw-r--r--builtin/check-attr.c9
-rwxr-xr-xt/t0003-attributes.sh2
2 files changed, 9 insertions, 2 deletions
diff --git a/builtin/check-attr.c b/builtin/check-attr.c
index e9b827ffb..6cf642139 100644
--- 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 f1debeb7a..22540051d 100755
--- 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 &&