Further clean-up: usage() vs die()
This hopefully finishes the clean-up Ramsay started with recent commit 15e593e4d37d1d350fef20ab666d58f6881c7f5f and commit 8cdf33643dc0b21d9ea922a3fdd7f64226c421aa. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
Aug 3, 2006 at 21:55 UTC
cba05fa840b637db2708014142a753680d930082
4 files changed
+5
-5
builtin-check-ref-format.c
+1
-1
@@ -9,6 +9,6 @@
9
int cmd_check_ref_format(int argc, const char **argv, const char *prefix)
10
{
11
if (argc != 2)
12
- usage("git check-ref-format refname");
12
+ usage("git-check-ref-format refname");
13
return !!check_ref_format(argv[1]);
14
}
builtin-mv.c
+1
-1
@@ -99,7 +99,7 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
99
ignore_errors = 1;
100
continue;
101
}
102
- die(builtin_mv_usage);
102
+ usage(builtin_mv_usage);
103
}
104
count = argc - i - 1;
105
if (count < 1)
builtin-prune.c
+1
-1
@@ -10,7 +10,7 @@
10
#include "builtin.h"
11
#include "cache-tree.h"
12
13
-static const char prune_usage[] = "git prune [-n]";
13
+static const char prune_usage[] = "git-prune [-n]";
14
static int show_only = 0;
15
static struct rev_info revs;
16
builtin-rm.c
+2
-2
@@ -115,7 +115,7 @@ int cmd_rm(int argc, const char **argv, const char *prefix)
115
printf("rm '%s'\n", path);
116
117
if (remove_file_from_cache(path))
118
- die("git rm: unable to remove %s", path);
118
+ die("git-rm: unable to remove %s", path);
119
cache_tree_invalidate_path(active_cache_tree, path);
120
}
121
@@ -139,7 +139,7 @@ int cmd_rm(int argc, const char **argv, const char *prefix)
139
continue;
140
}
141
if (!removed)
142
- die("git rm: %s: %s", path, strerror(errno));
142
+ die("git-rm: %s: %s", path, strerror(errno));
143
}
144
}
145