mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/empty' into next

Browse Source 
* jc/empty:
  revision traversal: --remove-empty fix.
  annotate-tests: override VISUAL when running tests.
This commit is contained in:
Junio C Hamano
2006-03-12 13:43:36 -08:00
parent 28f7533f70 a41e109c4b
commit 3dcf2d0e00
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
revision.c
View File

@ -313,8 +313,12 @@ static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit)
case REV_TREE_NEW: case REV_TREE_NEW:
if (revs->remove_empty_trees && if (revs->remove_empty_trees &&
rev_same_tree_as_empty(p->tree)) { rev_same_tree_as_empty(p->tree)) {
*pp = parent->next; /* We are adding all the specified paths from
continue; * 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 */ /* fallthrough */
case REV_TREE_DIFFERENT: case REV_TREE_DIFFERENT:

2
t/annotate-tests.sh
View File

@ -94,7 +94,7 @@ test_expect_success \
test_expect_success \ test_expect_success \
'merge-setup part 4' \ 'merge-setup part 4' \
'echo "evil merge." >>file && 'echo "evil merge." >>file &&
EDITOR=: git commit -a --amend' EDITOR=: VISUAL=: git commit -a --amend'
test_expect_success \ test_expect_success \
'Two lines blamed on A, one on B, two on B1, one on B2, one on A U Thor' \ 'Two lines blamed on A, one on B, two on B1, one on B2, one on A U Thor' \