From: Junio C Hamano <junkio@cox.net>
Date: Wed, 11 Jan 2006 21:57:42 +0000 (-0800)
Subject: git-describe: default to HEAD
X-Git-Tag: v1.2.0~152
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4c34a2c555f8064d45e655e45fd40d7e2b203d6e;p=git.git

git-describe: default to HEAD

This is based on the patch by Andreas Ericsson, but done slightly
differently, preferring to have separate loops -- one for options
and then arguments.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/describe.c b/describe.c
index a0180f548..1e764026b 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);
@@ -136,29 +144,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;
 }