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

[PATCH] Fixes a problem with --merge-order A B (A is linear descendent of a merge B)

Browse Source 
This patch passes the test case introduced by the previous patch.

Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Jon Seymour 2005-07-07 02:39:35 +10:00 committed by Linus Torvalds
parent 4d3a63ba3a
commit ff9206e72c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epoch.c
View File

@ -606,7 +606,7 @@ int sort_list_in_merge_order(struct commit_list *list, emitter_func emitter)
while (reversed) { while (reversed) {
struct commit * next = pop_commit(&reversed); struct commit * next = pop_commit(&reversed);
if (!(next->object.flags & VISITED)) { if (!(next->object.flags & VISITED) && next!=base) {
sort_first_epoch(next, &stack); sort_first_epoch(next, &stack);
if (reversed) { if (reversed) {
/* /*