describe: omit clearing marks on the last one.

Junio C Hamano · Junio C Hamano · commit 181dc776956b · 2006-01-15T22:15:37.000-08:00
When describing more than one, we need to clear the commit marks
before handling the next one, but most of the time we are
running it for only one commit, and in such a case this clearing
phase is totally unnecessary.

Signed-off-by: Junio C Hamano &lt;junkio@cox.net&gt;
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(struct commit *cmit)
+static void describe(struct commit *cmit, int last_one)
 {
 	struct commit_list *list;
 	static int initialized = 0;
@@ -124,7 +124,8 @@ static void describe(struct commit *cmit)
 		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;
 		}
 	}
@@ -159,7 +160,7 @@ int main(int argc, char **argv)
 		cmit = lookup_commit_reference(sha1);
 		if (!cmit)
 			usage(describe_usage);
-		describe(cmit);
+		describe(cmit, i == argc - 1);
 	}
 	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(struct commit *cmit)`
	`101`	`+static void describe(struct commit *cmit, int last_one)`
`102`	`102`	`{`
`103`	`103`	`struct commit_list *list;`
`104`	`104`	`static int initialized = 0;`
`@@ -124,7 +124,8 @@ static void describe(struct commit *cmit)`
`124`	`124`	`if (n) {`
`125`	`125`	`printf("%s-g%s\n", n->path,`
`126`	`126`	`find_unique_abbrev(cmit->object.sha1, abbrev));`
`127`		`- clear_commit_marks(cmit, SEEN);`
	`127`	`+ if (!last_one)`
	`128`	`+ clear_commit_marks(cmit, SEEN);`
`128`	`129`	`return;`
`129`	`130`	`}`
`130`	`131`	`}`
`@@ -159,7 +160,7 @@ int main(int argc, char **argv)`
`159`	`160`	`cmit = lookup_commit_reference(sha1);`
`160`	`161`	`if (!cmit)`
`161`	`162`	`usage(describe_usage);`
`162`		`- describe(cmit);`
	`163`	`+ describe(cmit, i == argc - 1);`
`163`	`164`	`}`
`164`	`165`	`return 0;`
`165`	`166`	`}`