X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=revision.c;h=12cd0529a5dfac9af01af0f47e895e9cf142c42a;hb=a5370b16c34993c1d0f65171d5704244901e005b;hp=01386ed6d476a80e9ee8e3afe354be20caad67b3;hpb=4a6c77cc0a2c9826d532c0ef1da4def8d8188584;p=git.git

diff --git a/revision.c b/revision.c
index 01386ed6..12cd0529 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: