undef/git-commit-vandalism
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 (take #2).
This commit is contained in:
Junio C Hamano 2006-03-12 17:27:23 -08:00
commit a7e71bb489
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
revision.c
View File

@ -313,12 +313,16 @@ 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)) {
/* We are adding all the specified paths from /* We are adding all the specified
* this parent, so the parents of it is * paths from this parent, so the
* not interesting, but the difference between * history beyond this parent is not
* this parent and us still is interesting. * interesting. Remove its parents
* (they are grandparents for us).
* IOW, we pretend this parent is a
* "root" commit.
*/ */
p->object.flags |= UNINTERESTING; parse_commit(p);
p->parents = NULL;
} }
/* fallthrough */ /* fallthrough */
case REV_TREE_DIFFERENT: case REV_TREE_DIFFERENT: