Merge branch 'jc/empty' into next

* jc/empty:
  revision traversal: --remove-empty fix.
  annotate-tests: override VISUAL when running tests.

diff --cc revision.c
index 01386ed6d476a80e9ee8e3afe354be20caad67b3,03085ffe9d9eafb2e40b962b75608b139d25e108..38a8d1b937b8dc3d1d48037ff916bf9e5e564eaa
--- 1/revision.c
--- 2/revision.c
+++ b/revision.c
@@@ -310,14 -314,18 +310,18 @@@ 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 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:
 +              case REV_TREE_DIFFERENT:
                        tree_changed = 1;
                        pp = &parent->next;
                        continue;