From a41e109c4bcd56537fc3801623b1aa0dd4e06f1c Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 12 Mar 2006 13:39:31 -0800 Subject: [PATCH 1/2] revision traversal: --remove-empty fix. Marco Costalba reports that --remove-empty omits the commit that created paths we are interested in. try_to_simplify_commit() logic was dropping a parent we introduced those paths against, which I think is not what we meant. Instead, this marks such parent uninteresting. The traversal does not go beyond that parent as advertised, but we still say that the current commit changed things from that parent. Signed-off-by: Junio C Hamano --- revision.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/revision.c b/revision.c index c8d93ff106d..03085ffe9d9 100644 --- a/revision.c +++ b/revision.c @@ -315,9 +315,14 @@ static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit) return; case TREE_NEW: - if (revs->remove_empty_trees && same_tree_as_empty(p->tree)) { - *pp = parent->next; - continue; + if (revs->remove_empty_trees && + same_tree_as_empty(p->tree)) { + /* We are adding all the specified paths from + * this parent, so the parents of it is + * not interesting, but the difference between + * this parent and us still is interesting. + */ + p->object.flags |= UNINTERESTING; } /* fallthrough */ case TREE_DIFFERENT: From c348f31ab9d8f695aef405d9981b85c943a5875a Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 12 Mar 2006 13:39:31 -0800 Subject: [PATCH 2/2] revision traversal: --remove-empty fix (take #2). Marco Costalba reports that --remove-empty omits the commit that created paths we are interested in. try_to_simplify_commit() logic was dropping a parent we introduced those paths against, which I think is not what we meant. Instead, this makes such parent parentless. Signed-off-by: Junio C Hamano --- revision.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/revision.c b/revision.c index 03085ffe9d9..73fba5d3daa 100644 --- a/revision.c +++ b/revision.c @@ -317,12 +317,16 @@ static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit) case TREE_NEW: if (revs->remove_empty_trees && same_tree_as_empty(p->tree)) { - /* We are adding all the specified paths from - * this parent, so the parents of it is - * not interesting, but the difference between - * this parent and us still is interesting. + /* 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. */ - p->object.flags |= UNINTERESTING; + parse_commit(p); + p->parents = NULL; } /* fallthrough */ case TREE_DIFFERENT: