mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Topo-sort before --simplify-merges

Browse Source 
This makes the algorithm more honest about what it is doing.

We start from an already limited, topo-sorted list, and postprocess
it by simplifying the irrelevant merges away.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano
2008-08-03 17:47:16 -07:00
parent 6546b5931e
commit 6534703059
2 changed files with 95 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
revision.c
View File

@ -1493,6 +1493,8 @@ static void simplify_merges(struct rev_info *revs)
struct commit_list *list;
struct commit_list *yet_to_do, **tail;
sort_in_topological_order(&revs->commits, revs->lifo);
/* feed the list reversed */
yet_to_do = NULL;
for (list = revs->commits; list; list = list->next)
@ -1522,9 +1524,6 @@ static void simplify_merges(struct rev_info *revs)
if (commit->util == commit)
tail = &commit_list_insert(commit, tail)->next;
}
/* sort topologically at the end */
sort_in_topological_order(&revs->commits, revs->lifo);
}
static void set_children(struct rev_info *revs)