From: Junio C Hamano <junkio@cox.net>
Date: Fri, 24 Feb 2006 09:33:57 +0000 (-0800)
Subject: Merge fix bits from jc/rev-list
X-Git-Tag: v1.3.0-rc1~54^2~36
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/4b953cdc04fec8783e2c654a671005492fda9b01?ds=inline;hp=-c

Merge fix bits from jc/rev-list
---

4b953cdc04fec8783e2c654a671005492fda9b01
diff --combined rev-list.c
index 15894005c5,b5de0759f9..6cd83ed75b
--- a/rev-list.c
+++ b/rev-list.c
@@@ -256,8 -256,8 +256,8 @@@ static void show_commit_list(struct com
  		die("unknown pending object %s (%s)", sha1_to_hex(obj->sha1), name);
  	}
  	while (objects) {
 -		/* An object with name "foo\n0000000000000000000000000000000000000000"
 -		 * can be used confuse downstream git-pack-objects very badly.
 +		/* An object with name "foo\n0000000..." can be used to
 +		 * confuse downstream git-pack-objects very badly.
  		 */
  		const char *ep = strchr(objects->name, '\n');
  		if (ep) {
@@@ -440,8 -440,10 +440,10 @@@ static void mark_edge_parents_uninteres
  		if (!(parent->object.flags & UNINTERESTING))
  			continue;
  		mark_tree_uninteresting(parent->tree);
- 		if (edge_hint)
+ 		if (edge_hint && !(parent->object.flags & SHOWN)) {
+ 			parent->object.flags |= SHOWN;
  			printf("-%s\n", sha1_to_hex(parent->object.sha1));
+ 		}
  	}
  }