From cba05fa840b637db2708014142a753680d930082 Mon Sep 17 00:00:00 2001
From: Junio C Hamano <junkio@cox.net>
Date: Thu, 3 Aug 2006 21:55:41 -0700
Subject: [PATCH] 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>
---
 builtin-check-ref-format.c | 2 +-
 builtin-mv.c               | 2 +-
 builtin-prune.c            | 2 +-
 builtin-rm.c               | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/builtin-check-ref-format.c b/builtin-check-ref-format.c
index 701de439ae..fe04be77a9 100644
--- 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)
-		usage("git check-ref-format refname");
+		usage("git-check-ref-format refname");
 	return !!check_ref_format(argv[1]);
 }
diff --git a/builtin-mv.c b/builtin-mv.c
index 62ae937cb1..e47942c135 100644
--- 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;
 		}
-		die(builtin_mv_usage);
+		usage(builtin_mv_usage);
 	}
 	count = argc - i - 1;
 	if (count < 1)
diff --git a/builtin-prune.c b/builtin-prune.c
index 6a86eb52ae..89ec7f1426 100644
--- a/builtin-prune.c
+++ b/builtin-prune.c
@@ -10,7 +10,7 @@
 #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;
 
diff --git a/builtin-rm.c b/builtin-rm.c
index a0882bf1b0..8af3d7eb48 100644
--- 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))
-			die("git rm: unable to remove %s", path);
+			die("git-rm: unable to remove %s", 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)
-				die("git rm: %s: %s", path, strerror(errno));
+				die("git-rm: %s: %s", path, strerror(errno));
 		}
 	}