Replace some calls to die(usage_str) with usage(usage_str).
The only change in behaviour should be having a "usage: " prefix on the output string rather than "fatal: ", and an exit code of 129 rather than 128. Signed-off-by: Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
15e593e4d3
commit
8cdf33643d
@ -117,7 +117,7 @@ int cmd_add(int argc, const char **argv, const char *prefix)
|
||||
verbose = 1;
|
||||
continue;
|
||||
}
|
||||
die(builtin_add_usage);
|
||||
usage(builtin_add_usage);
|
||||
}
|
||||
pathspec = get_pathspec(prefix, argv + i);
|
||||
|
||||
|
@ -267,7 +267,7 @@ int cmd_init_db(int argc, const char **argv, const char *prefix)
|
||||
else if (!strncmp(arg, "--shared=", 9))
|
||||
shared_repository = git_config_perm("arg", arg+9);
|
||||
else
|
||||
die(init_db_usage);
|
||||
usage(init_db_usage);
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -80,7 +80,7 @@ int cmd_rm(int argc, const char **argv, const char *prefix)
|
||||
force = 1;
|
||||
continue;
|
||||
}
|
||||
die(builtin_rm_usage);
|
||||
usage(builtin_rm_usage);
|
||||
}
|
||||
if (argc <= i)
|
||||
usage(builtin_rm_usage);
|
||||
|
@ -73,7 +73,7 @@ int cmd_write_tree(int argc, const char **argv, const char *unused_prefix)
|
||||
else if (!strncmp(arg, "--prefix=", 9))
|
||||
prefix = arg + 9;
|
||||
else
|
||||
die(write_tree_usage);
|
||||
usage(write_tree_usage);
|
||||
argc--; argv++;
|
||||
}
|
||||
|
||||
|
@ -46,7 +46,7 @@ int main(int argc, char **argv)
|
||||
if (!no_more_flags && argv[i][0] == '-') {
|
||||
if (!strcmp(argv[i], "-t")) {
|
||||
if (argc <= ++i)
|
||||
die(hash_object_usage);
|
||||
usage(hash_object_usage);
|
||||
type = argv[i];
|
||||
}
|
||||
else if (!strcmp(argv[i], "-w")) {
|
||||
@ -66,8 +66,8 @@ int main(int argc, char **argv)
|
||||
hash_stdin(type, write_object);
|
||||
}
|
||||
else
|
||||
die(hash_object_usage);
|
||||
}
|
||||
usage(hash_object_usage);
|
||||
}
|
||||
else {
|
||||
const char *arg = argv[i];
|
||||
if (0 <= prefix_length)
|
||||
|
Loading…
Reference in New Issue
Block a user