X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=describe.c;h=fabadb827fb5d7852028e5d8e437e315215f90b1;hb=ffd97f3a35d8394773409f17d58156b32ca911cf;hp=5548a16e4d97690e207a6e7cd0699aa8de73f81f;hpb=59617ebb746b67921856c00a63f943d43b0abeea;p=git.git

diff --git a/describe.c b/describe.c
index 5548a16e..fabadb82 100644
--- a/describe.c
+++ b/describe.c
@@ -98,12 +98,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)
 {
+	unsigned char sha1[20];
+	struct commit *cmit;
 	struct commit_list *list;
 	static int initialized = 0;
 	struct commit_name *n;
 
+	if (get_sha1(arg, sha1) < 0)
+		usage(describe_usage);
+	cmit = lookup_commit_reference(sha1);
+	if (!cmit)
+		usage(describe_usage);
+
 	if (!initialized) {
 		initialized = 1;
 		for_each_ref(get_name);
@@ -137,29 +145,27 @@ 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)
 				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");
+	else
+		while (i < argc)
+			describe(argv[i++]);
+
 	return 0;
 }