@matheusbsbs / matheus-bagliano / commits / 6631c73685
Fork 0

revision.c: --full-history fix.

With history simplification, we still show merges that are required to make the history _complete_, i.e. say that you had: a | b / \ c d | | and neither "a" nor "b" actually changed the file, but both "c" and "d" did: in this case we have to leave "b" around just because otherwise there would be no way to show the _relationship_, even if "b" itself doesn't actually change the tree in any way what-so-ever. It would make sense to make that further simplification if the "--parents" flag wasn't present. In that case the user is literally asking for a list of commits and is not interested in the relationship between them. This patch also fixes a real bug. Without this patch, the "--parents --full-history" combination (which you'd get if you do something like gitk --full-history Makefile or similar) will actually _drop_ merges where all children are identical. That's wrong in the --full-history case, because it means that the graph ends up missing lots of entries. In the process, this also should make git-rev-list --full-history Makefile give just the _true_ list of all commits that changed Makefile (and properly ignore merges that were identical in one parent), because now we're not asking for "--parent", so we don't need the unnecessary merge commits to keep the history together. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>

Linus Torvalds committed Jun 30, 2006 at 20:21 UTC 6631c73685bea3c6300938f4900db0d0c6bee457
1 file changed +14 -4
revision.c
+14 -4
@@ -280,7 +280,7 @@ int rev_same_tree_as_empty(struct rev_info *revs, struct tree *t1)
280 static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit)
281 {
282 struct commit_list **pp, *parent;
283 - int tree_changed = 0;
283 + int tree_changed = 0, tree_same = 0;
284
285 if (!commit->tree)
286 return;
@@ -298,6 +298,7 @@ static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit)
298 parse_commit(p);
299 switch (rev_compare_tree(revs, p->tree, commit->tree)) {
300 case REV_TREE_SAME:
301 + tree_same = 1;
302 if (!revs->simplify_history || (p->object.flags & UNINTERESTING)) {
303 /* Even if a merge with an uninteresting
304 * side branch brought the entire change
@@ -334,7 +335,7 @@ static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit)
335 }
336 die("bad tree compare for commit %s", sha1_to_hex(commit->object.sha1));
337 }
337 - if (tree_changed)
338 + if (tree_changed && !tree_same)
339 commit->object.flags |= TREECHANGE;
340 }
341
@@ -896,6 +897,8 @@ static int rewrite_one(struct rev_info *revs, struct commit **pp)
897 struct commit *p = *pp;
898 if (!revs->limited)
899 add_parents_to_list(revs, p, &revs->commits);
900 + if (p->parents && p->parents->next)
901 + return 0;
902 if (p->object.flags & (TREECHANGE | UNINTERESTING))
903 return 0;
904 if (!p->parents)
@@ -988,8 +991,15 @@ struct commit *get_revision(struct rev_info *revs)
991 commit->parents && commit->parents->next)
992 continue;
993 if (revs->prune_fn && revs->dense) {
991 - if (!(commit->object.flags & TREECHANGE))
992 - continue;
994 + /* Commit without changes? */
995 + if (!(commit->object.flags & TREECHANGE)) {
996 + /* drop merges unless we want parenthood */
997 + if (!revs->parents)
998 + continue;
999 + /* non-merge - always ignore it */
1000 + if (commit->parents && !commit->parents->next)
1001 + continue;
1002 + }
1003 if (revs->parents)
1004 rewrite_parents(revs, commit);
1005 }