undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/empty'

Browse Source 
* jc/empty:
  revision traversal: --remove-empty fix (take #2).
  revision traversal: --remove-empty fix.

Conflicts:

	revision.c (adjust for the updates by Fredrik)
This commit is contained in:
Junio C Hamano 2006-03-18 00:43:47 -08:00
commit 8a414ad50c
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
revision.c
View File

@ -313,8 +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)) {
*pp = parent->next; /* We are adding all the specified
continue; * paths from this parent, so the
* history beyond this parent is not
* interesting. Remove its parents
* (they are grandparents for us).
* IOW, we pretend this parent is a
* "root" commit.
*/
parse_commit(p);
p->parents = NULL;
} }
/* fallthrough */ /* fallthrough */
case REV_TREE_DIFFERENT: case REV_TREE_DIFFERENT: