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 --cc revision.c
index 01386ed6d476a80e9ee8e3afe354be20caad67b3,73fba5d3daa0a3447827bf85af513c0ad033a27e..12cd0529a5dfac9af01af0f47e895e9cf142c42a
--- 1/revision.c
--- 2/revision.c
+++ b/revision.c
@@@ -310,14 -314,22 +310,22 @@@ static void try_to_simplify_commit(stru
                        commit->parents = parent;
                        return;
  
 -              case TREE_NEW:
 +              case REV_TREE_NEW:
                        if (revs->remove_empty_trees &&
 -                          same_tree_as_empty(p->tree)) {
 +                          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 TREE_DIFFERENT:
 +              case REV_TREE_DIFFERENT:
                        tree_changed = 1;
                        pp = &parent->next;
                        continue;