Skip to content

Commit

Permalink
revision traversal: --remove-empty fix.
Browse files Browse the repository at this point in the history
Marco Costalba reports that --remove-empty omits the commit that
created paths we are interested in.  try_to_simplify_commit()
logic was dropping a parent we introduced those paths against,
which I think is not what we meant.  Instead, this marks such
parent uninteresting.  The traversal does not go beyond that
parent as advertised, but we still say that the current commit
changed things from that parent.

Signed-off-by: Junio C Hamano <junkio@cox.net>
  • Loading branch information
Junio C Hamano committed Mar 12, 2006
1 parent 8c32220 commit a41e109
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions revision.c
Original file line number Diff line number Diff line change
Expand Up @@ -315,9 +315,14 @@ static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit)
return;

case TREE_NEW:
if (revs->remove_empty_trees && same_tree_as_empty(p->tree)) {
*pp = parent->next;
continue;
if (revs->remove_empty_trees &&
same_tree_as_empty(p->tree)) {
/* 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:
Expand Down

0 comments on commit a41e109

Please sign in to comment.