diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-03-12 13:43:36 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-03-12 13:43:36 -0800 |
| commit | 3dcf2d0e00d615cbc046f6ebb5eff3e6fcb1442f (patch) | |
| tree | acb0bd9dc787ad2daafffa6cf1638ddb4705767a | |
| parent | Merge branch 'master' into next (diff) | |
| parent | revision traversal: --remove-empty fix. (diff) | |
| download | tgif-3dcf2d0e00d615cbc046f6ebb5eff3e6fcb1442f.tar.xz | |
Merge branch 'jc/empty' into next
* jc/empty:
revision traversal: --remove-empty fix.
annotate-tests: override VISUAL when running tests.
| -rw-r--r-- | revision.c | 8 | ||||
| -rw-r--r-- | t/annotate-tests.sh | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/revision.c b/revision.c index 01386ed6d4..38a8d1b937 100644 --- a/revision.c +++ b/revision.c @@ -313,8 +313,12 @@ 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 parents of it is + * not interesting, but the difference between + * this parent and us still is interesting. + */ + p->object.flags |= UNINTERESTING; } /* fallthrough */ case REV_TREE_DIFFERENT: diff --git a/t/annotate-tests.sh b/t/annotate-tests.sh index 9c5a15a15e..114938c3ff 100644 --- a/t/annotate-tests.sh +++ b/t/annotate-tests.sh @@ -94,7 +94,7 @@ test_expect_success \ test_expect_success \ 'merge-setup part 4' \ 'echo "evil merge." >>file && - EDITOR=: git commit -a --amend' + EDITOR=: VISUAL=: git commit -a --amend' test_expect_success \ 'Two lines blamed on A, one on B, two on B1, one on B2, one on A U Thor' \ |