X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=describe.c;h=8a9cd5d52c555330c512b977179ab030ccd28861;hb=7a97de4e19757b5576f32ce67d90cb792dbb893b;hp=84d96b5b82bf5d1b688da39208077df5ca6ef6d9;hpb=64deb858b0c71f485d186e91cd00cf8b6ec64087;p=git.git

diff --git a/describe.c b/describe.c
index 84d96b5b..8a9cd5d5 100644
--- a/describe.c
+++ b/describe.c
@@ -11,14 +11,13 @@ static const char describe_usage[] =
 static int all = 0;	/* Default to annotated tags only */
 static int tags = 0;	/* 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 struct commit_name {
 	const struct commit *commit;
 	int prio; /* annotated tag = 2, tag = 1, head = 0 */
-	char path[];
+	char path[FLEX_ARRAY]; /* more */
 } **name_array = NULL;
 
 static struct commit_name *match(struct commit *cmit)
@@ -98,12 +97,20 @@ 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(struct commit *cmit)
+static void describe(char *arg, int last_one)
 {
+	unsigned char sha1[20];
+	struct commit *cmit;
 	struct commit_list *list;
 	static int initialized = 0;
 	struct commit_name *n;
 
+	if (get_sha1(arg, sha1))
+		die("Not a valid object name %s", arg);
+	cmit = lookup_commit_reference(sha1);
+	if (!cmit)
+		die("%s is not a valid '%s' object", arg, commit_type);
+
 	if (!initialized) {
 		initialized = 1;
 		for_each_ref(get_name);
@@ -124,9 +131,12 @@ static void describe(struct commit *cmit)
 		if (n) {
 			printf("%s-g%s\n", n->path,
 			       find_unique_abbrev(cmit->object.sha1, abbrev));
+			if (!last_one)
+				clear_commit_marks(cmit, SEEN);
 			return;
 		}
 	}
+	die("cannot describe '%s'", sha1_to_hex(cmit->object.sha1));
 }
 
 int main(int argc, char **argv)
@@ -135,29 +145,29 @@ int main(int argc, char **argv)
 
 	for (i = 1; i < argc; i++) {
 		const char *arg = argv[i];
-		unsigned char sha1[20];
-		struct commit *cmit;
 
-		if (!strcmp(arg, "--all")) {
+		if (*arg != '-')
+			break;
+		else if (!strcmp(arg, "--all"))
 			all = 1;
-			continue;
-		}
-		if (!strcmp(arg, "--tags")) {
+		else if (!strcmp(arg, "--tags"))
 			tags = 1;
-			continue;
-		}
-		if (!strncmp(arg, "--abbrev=", 9)) {
+		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;
-			continue;
 		}
-		if (get_sha1(arg, sha1) < 0)
-			usage(describe_usage);
-		cmit = lookup_commit_reference(sha1);
-		if (!cmit)
+		else
 			usage(describe_usage);
-		describe(cmit);
 	}
+
+	if (i == argc)
+		describe("HEAD", 1);
+	else
+		while (i < argc) {
+			describe(argv[i], (i == argc - 1));
+			i++;
+		}
+
 	return 0;
 }