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>

diff --git a/builtin-check-ref-format.c b/builtin-check-ref-format.c
index 701de439ae0f508f3a8ab41559230357be60637e..fe04be77a9312c11fa054897c5982fa6c74b8e5e 100644 (file)
--- a/builtin-check-ref-format.c
+++ b/builtin-check-ref-format.c
@@ -9,6 +9,6 @@
 int cmd_check_ref_format(int argc, const char **argv, const char *prefix)
 {
        if (argc != 2)
 int cmd_check_ref_format(int argc, const char **argv, const char *prefix)
 {
        if (argc != 2)

-               usage("git check-ref-format refname");
+               usage("git-check-ref-format refname");

        return !!check_ref_format(argv[1]);
 }
        return !!check_ref_format(argv[1]);
 }

diff --git a/builtin-mv.c b/builtin-mv.c
index 62ae937cb13f43f871bf2ec3543f7db37f9e87b6..e47942c13522b2bc8a83203c61071697c9a03307 100644 (file)
--- a/builtin-mv.c
+++ b/builtin-mv.c
@@ -99,7 +99,7 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
                        ignore_errors = 1;
                        continue;
                }
                        ignore_errors = 1;
                        continue;
                }

-               die(builtin_mv_usage);
+               usage(builtin_mv_usage);

        }
        count = argc - i - 1;
        if (count < 1)
        }
        count = argc - i - 1;
        if (count < 1)

diff --git a/builtin-prune.c b/builtin-prune.c
index 6a86eb52aedc45b0a59adad4da31341440f2f82e..89ec7f1426d3f5d02486e3148b0c568edbe15300 100644 (file)
--- a/builtin-prune.c
+++ b/builtin-prune.c
@@ -10,7 +10,7 @@
 #include "builtin.h"
 #include "cache-tree.h"
 
 #include "builtin.h"
 #include "cache-tree.h"
 

-static const char prune_usage[] = "git prune [-n]";
+static const char prune_usage[] = "git-prune [-n]";

 static int show_only = 0;
 static struct rev_info revs;
 
 static int show_only = 0;
 static struct rev_info revs;
 

diff --git a/builtin-rm.c b/builtin-rm.c
index a0882bf1b045c1db91511e5e7c156a3198eb4c82..8af3d7eb48e70dc9a640c2e96a058903fb9fddd8 100644 (file)
--- a/builtin-rm.c
+++ b/builtin-rm.c
@@ -115,7 +115,7 @@ int cmd_rm(int argc, const char **argv, const char *prefix)
                printf("rm '%s'\n", path);
 
                if (remove_file_from_cache(path))
                printf("rm '%s'\n", path);
 
                if (remove_file_from_cache(path))

-                       die("git rm: unable to remove %s", path);
+                       die("git-rm: unable to remove %s", path);

                cache_tree_invalidate_path(active_cache_tree, path);
        }
 
                cache_tree_invalidate_path(active_cache_tree, path);
        }
 


@@ -139,7 +139,7 @@ int cmd_rm(int argc, const char **argv, const char *prefix)
                                continue;
                        }
                        if (!removed)
                                continue;
                        }
                        if (!removed)

-                               die("git rm: %s: %s", path, strerror(errno));
+                               die("git-rm: %s: %s", path, strerror(errno));

                }
        }
 
                }
        }