mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace some calls to die(usage_str) with usage(usage_str).

Browse Source 
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:
Ramsay Allan Jones
2006-08-03 16:48:41 +01:00
committed by Junio C Hamano
parent 15e593e4d3
commit 8cdf33643d
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
builtin-add.c
View File

@ -117,7 +117,7 @@ int cmd_add(int argc, const char **argv, const char *prefix)
verbose = 1; verbose = 1;
continue; continue;
} }
die(builtin_add_usage); usage(builtin_add_usage);
} }
pathspec = get_pathspec(prefix, argv + i); pathspec = get_pathspec(prefix, argv + i);

2
builtin-init-db.c
View File

@ -267,7 +267,7 @@ int cmd_init_db(int argc, const char **argv, const char *prefix)
else if (!strncmp(arg, "--shared=", 9)) else if (!strncmp(arg, "--shared=", 9))
shared_repository = git_config_perm("arg", arg+9); shared_repository = git_config_perm("arg", arg+9);
else else
die(init_db_usage); usage(init_db_usage);
} }
/* /*

2
builtin-rm.c
View File

@ -80,7 +80,7 @@ int cmd_rm(int argc, const char **argv, const char *prefix)
force = 1; force = 1;
continue; continue;
} }
die(builtin_rm_usage); usage(builtin_rm_usage);
} }
if (argc <= i) if (argc <= i)
usage(builtin_rm_usage); usage(builtin_rm_usage);

2
builtin-write-tree.c
View File

@ -73,7 +73,7 @@ int cmd_write_tree(int argc, const char **argv, const char *unused_prefix)
else if (!strncmp(arg, "--prefix=", 9)) else if (!strncmp(arg, "--prefix=", 9))
prefix = arg + 9; prefix = arg + 9;
else else
die(write_tree_usage); usage(write_tree_usage);
argc--; argv++; argc--; argv++;
} }

6
hash-object.c
View File

@ -46,7 +46,7 @@ int main(int argc, char **argv)
if (!no_more_flags && argv[i][0] == '-') { if (!no_more_flags && argv[i][0] == '-') {
if (!strcmp(argv[i], "-t")) { if (!strcmp(argv[i], "-t")) {
if (argc <= ++i) if (argc <= ++i)
die(hash_object_usage); usage(hash_object_usage);
type = argv[i]; type = argv[i];
} }
else if (!strcmp(argv[i], "-w")) { else if (!strcmp(argv[i], "-w")) {
@ -66,8 +66,8 @@ int main(int argc, char **argv)
hash_stdin(type, write_object); hash_stdin(type, write_object);
} }
else else
die(hash_object_usage); usage(hash_object_usage);
} }
else { else {
const char *arg = argv[i]; const char *arg = argv[i];
if (0 <= prefix_length) if (0 <= prefix_length)