提交 a41e109c 编写于 作者: J Junio C Hamano

revision traversal: --remove-empty fix.

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: NJunio C Hamano <junkio@cox.net>
上级 8c322207
......@@ -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:
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册