From: Junio C Hamano <junkio@cox.net>
Date: Sat, 18 Mar 2006 08:43:47 +0000 (-0800)
Subject: Merge branch 'jc/empty'
X-Git-Tag: v1.3.0-rc1~20^2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8a414ad50cd9edfe6c8f0a6b9b08df4aaa9ccb75?hp=5a1fb2ca92caaa7ae9044ab81dc102f59d17b97a

Merge branch 'jc/empty'

* jc/empty:
revision traversal: --remove-empty fix (take #2).
revision traversal: --remove-empty fix.

Conflicts:

revision.c (adjust for the updates by Fredrik)
---

diff --git a/revision.c b/revision.c
index 01386ed6d4..12cd0529a5 100644
--- a/revision.c
+++ b/revision.c
@@ -313,8 +313,16 @@ static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit)
 		case REV_TREE_NEW:
 			if (revs->remove_empty_trees &&
 			    rev_same_tree_as_empty(p->tree)) {
-				*pp = parent->next;
-				continue;
+				/* We are adding all the specified
+				 * paths from this parent, so the
+				 * history beyond this parent is not
+				 * interesting.  Remove its parents
+				 * (they are grandparents for us).
+				 * IOW, we pretend this parent is a
+				 * "root" commit.
+				 */
+				parse_commit(p);
+				p->parents = NULL;
 			}
 		/* fallthrough */
 		case REV_TREE_DIFFERENT: