X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=describe.c;h=2b9301fc1205795e30dfd7a7493cb03cdebdb437;hb=68d42c41ef33cde500307660bb64a1c74f62711e;hp=4866510eafa19fbfe74e11d20e5d2d1a0a44fd4b;hpb=767e130915015f897fb87b939843b4882212574b;p=git.git

diff --git a/describe.c b/describe.c
index 4866510ea..2b9301fc1 100644
--- a/describe.c
+++ b/describe.c
@@ -8,13 +8,12 @@
 static const char describe_usage[] =
 "git-describe [--all] [--tags] [--abbrev=<n>] <committish>*";
 
-static int all = 0;	/* Default to annotated tags only */
-static int tags = 0;	/* But allow any tags if --tags is specified */
+static int all;	/* Default to annotated tags only */
+static int tags;	/* But allow any tags if --tags is specified */
 
-#define DEFAULT_ABBREV 8 /* maybe too many */
 static int abbrev = DEFAULT_ABBREV;
 
-static int names = 0, allocs = 0;
+static int names, allocs;
 static struct commit_name {
 	const struct commit *commit;
 	int prio; /* annotated tag = 2, tag = 1, head = 0 */
@@ -68,7 +67,7 @@ static int get_name(const char *path, const unsigned char *sha1)
 	 * Otherwise only annotated tags are used.
 	 */
 	if (!strncmp(path, "refs/tags/", 10)) {
-		if (object->type == tag_type)
+		if (object->type == OBJ_TAG)
 			prio = 2;
 		else
 			prio = 1;
@@ -98,7 +97,7 @@ static int compare_names(const void *_a, const void *_b)
 	return (a_date > b_date) ? -1 : (a_date == b_date) ? 0 : 1;
 }
 
-static void describe(char *arg, int last_one)
+static void describe(const char *arg, int last_one)
 {
 	unsigned char sha1[20];
 	struct commit *cmit;
@@ -106,11 +105,11 @@ static void describe(char *arg, int last_one)
 	static int initialized = 0;
 	struct commit_name *n;
 
-	if (get_sha1(arg, sha1) < 0)
-		usage(describe_usage);
+	if (get_sha1(arg, sha1))
+		die("Not a valid object name %s", arg);
 	cmit = lookup_commit_reference(sha1);
 	if (!cmit)
-		usage(describe_usage);
+		die("%s is not a valid '%s' object", arg, commit_type);
 
 	if (!initialized) {
 		initialized = 1;
@@ -155,7 +154,7 @@ int main(int argc, char **argv)
 			tags = 1;
 		else if (!strncmp(arg, "--abbrev=", 9)) {
 			abbrev = strtoul(arg + 9, NULL, 10);
-			if (abbrev < 4 || 40 <= abbrev)
+			if (abbrev < MINIMUM_ABBREV || 40 <= abbrev)
 				abbrev = DEFAULT_ABBREV;
 		}
 		else