From: Junio C Hamano <junkio@cox.net>
Date: Mon, 16 Jan 2006 06:25:35 +0000 (-0800)
Subject: Merge fixes up to GIT 1.1.3
X-Git-Tag: v1.2.0~139
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/fec9ebf?hp=-c

Merge fixes up to GIT 1.1.3
---

fec9ebf16c948bcb4a8b88d0173ee63584bcde76
diff --combined describe.c
index fabadb827f,cc95eb0f21..4866510eaf
--- a/describe.c
+++ b/describe.c
@@@ -98,20 -98,12 +98,20 @@@ static int compare_names(const void *_a
  	return (a_date > b_date) ? -1 : (a_date == b_date) ? 0 : 1;
  }
  
- static void describe(char *arg)
 -static void describe(struct commit *cmit, int last_one)
++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) < 0)
 +		usage(describe_usage);
 +	cmit = lookup_commit_reference(sha1);
 +	if (!cmit)
 +		usage(describe_usage);
 +
  	if (!initialized) {
  		initialized = 1;
  		for_each_ref(get_name);
@@@ -132,7 -124,8 +132,8 @@@
  		if (n) {
  			printf("%s-g%s\n", n->path,
  			       find_unique_abbrev(cmit->object.sha1, abbrev));
- 			clear_commit_marks(cmit, SEEN);
+ 			if (!last_one)
+ 				clear_commit_marks(cmit, SEEN);
  			return;
  		}
  	}
@@@ -145,27 -138,29 +146,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)
  				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, i == argc - 1);
  	}
 +
 +	if (i == argc)
- 		describe("HEAD");
++		describe("HEAD", 1);
 +	else
- 		while (i < argc)
- 			describe(argv[i++]);
++		while (i < argc) {
++			describe(argv[i], (i == argc - 1));
++			i++;
++		}
 +
  	return 0;
  }