undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-check-attr: Process command-line args more systematically

Browse Source 
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Michael Haggerty 2011-08-04 06:36:28 +02:00 committed by Junio C Hamano
parent 27937447ef
commit 72541040c3
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
builtin/check-attr.c
View File

@ -81,8 +81,6 @@ int cmd_check_attr(int argc, const char **argv, const char *prefix)
argc = parse_options(argc, argv, prefix, check_attr_options,
check_attr_usage, PARSE_OPT_KEEP_DASHDASH);
if (!argc)
usage_with_options(check_attr_usage, check_attr_options);
if (read_cache() < 0) {
die("invalid cache");
@ -94,8 +92,17 @@ int cmd_check_attr(int argc, const char **argv, const char *prefix)
doubledash = i;
}
/* If there is no double dash, we handle only one attribute */
if (doubledash < 0) {
/* Check attribute argument(s): */
if (doubledash == 0) {
error_with_usage("No attribute specified");
} else if (doubledash < 0) {
/*
* There is no double dash; treat the first
* argument as an attribute.
*/
if (!argc)
error_with_usage("No attribute specified");
cnt = 1;
filei = 1;
} else {
@ -103,9 +110,7 @@ int cmd_check_attr(int argc, const char **argv, const char *prefix)
filei = doubledash + 1;
}
if (cnt <= 0)
error_with_usage("No attribute specified");
/* Check file argument(s): */
if (stdin_paths && filei < argc)
error_with_usage("Can't specify files with --stdin");