From: Junio C Hamano <junkio@cox.net>
Date: Sun, 12 Mar 2006 21:43:36 +0000 (-0800)
Subject: Merge branch 'jc/empty' into next
X-Git-Tag: v1.3.0-rc1~34
X-Git-Url: https://git.octo.it/?p=git.git;a=commitdiff_plain;h=3dcf2d0e00d615cbc046f6ebb5eff3e6fcb1442f

Merge branch 'jc/empty' into next

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

3dcf2d0e00d615cbc046f6ebb5eff3e6fcb1442f
diff --cc revision.c
index 01386ed6,03085ffe..38a8d1b9
--- a/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;