Merge fixes up to GIT 1.1.3

Junio C Hamano · Junio C Hamano · commit fec9ebf16c94 · 2006-01-15T22:25:35.000-08:00
diff --git a/commit.c b/commit.c
@@ -359,8 +359,10 @@ void clear_commit_marks(struct commit *commit, unsigned int mark)
 	parents = commit->parents;
 	commit->object.flags &= ~mark;
 	while (parents) {
-		if (parents->item && parents->item->object.parsed)
-			clear_commit_marks(parents->item, mark);
+		struct commit *parent = parents->item;
+		if (parent && parent->object.parsed &&
+		    (parent->object.flags & mark))
+			clear_commit_marks(parent, mark);
 		parents = parents->next;
 	}
 }
diff --git a/describe.c b/describe.c
@@ -98,7 +98,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)
+static void describe(char *arg, int last_one)
 {
 	unsigned char sha1[20];
 	struct commit *cmit;
@@ -132,7 +132,8 @@ static void describe(char *arg)
 		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;
 		}
 	}
@@ -162,10 +163,12 @@ int main(int argc, char **argv)
 	}
 
 	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;
 }

Original file line number	Diff line number	Diff line change
`@@ -359,8 +359,10 @@ void clear_commit_marks(struct commit *commit, unsigned int mark)`
`359`	`359`	`parents = commit->parents;`
`360`	`360`	`commit->object.flags &= ~mark;`
`361`	`361`	`while (parents) {`
`362`		`- if (parents->item && parents->item->object.parsed)`
`363`		`- clear_commit_marks(parents->item, mark);`
	`362`	`+ struct commit *parent = parents->item;`
	`363`	`+ if (parent && parent->object.parsed &&`
	`364`	`+ (parent->object.flags & mark))`
	`365`	`+ clear_commit_marks(parent, mark);`
`364`	`366`	`parents = parents->next;`
`365`	`367`	`}`
`366`	`368`	`}`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ static int compare_names(const void _a, const void _b)`
`98`	`98`	`return (a_date > b_date) ? -1 : (a_date == b_date) ? 0 : 1;`
`99`	`99`	`}`
`100`	`100`
`101`		`-static void describe(char *arg)`
	`101`	`+static void describe(char *arg, int last_one)`
`102`	`102`	`{`
`103`	`103`	`unsigned char sha1[20];`
`104`	`104`	`struct commit *cmit;`
`@@ -132,7 +132,8 @@ static void describe(char *arg)`
`132`	`132`	`if (n) {`
`133`	`133`	`printf("%s-g%s\n", n->path,`
`134`	`134`	`find_unique_abbrev(cmit->object.sha1, abbrev));`
`135`		`- clear_commit_marks(cmit, SEEN);`
	`135`	`+ if (!last_one)`
	`136`	`+ clear_commit_marks(cmit, SEEN);`
`136`	`137`	`return;`
`137`	`138`	`}`
`138`	`139`	`}`
`@@ -162,10 +163,12 @@ int main(int argc, char **argv)`
`162`	`163`	`}`
`163`	`164`
`164`	`165`	`if (i == argc)`
`165`		`- describe("HEAD");`
	`166`	`+ describe("HEAD", 1);`
`166`	`167`	`else`
`167`		`- while (i < argc)`
`168`		`- describe(argv[i++]);`
	`168`	`+ while (i < argc) {`
	`169`	`+ describe(argv[i], (i == argc - 1));`
	`170`	`+ i++;`
	`171`	`+ }`
`169`	`172`
`170`	`173`	`return 0;`
`171`	`174`	`}`