diff options
| author | Jon Seymour <jon.seymour@gmail.com> | 2005-07-07 02:39:35 +1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-06 10:29:30 -0700 |
| commit | ff9206e72c71aa2e51c7cbee911f47b5838a5845 (patch) | |
| tree | d4f74f740dfcb97670df7b69e64b252149db2bfb /epoch.c | |
| parent | 4d3a63ba3a1f80e03312c5ec28734b27583a0756 (diff) | |
| download | git-ff9206e72c71aa2e51c7cbee911f47b5838a5845.tar.gz | |
[PATCH] Fixes a problem with --merge-order A B (A is linear descendent of a merge B)
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>
Diffstat (limited to 'epoch.c')
| -rw-r--r-- | epoch.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -606,7 +606,7 @@ int sort_list_in_merge_order(struct commit_list *list, emitter_func emitter) while (reversed) { struct commit * next = pop_commit(&reversed); - if (!(next->object.flags & VISITED)) { + if (!(next->object.flags & VISITED) && next!=base) { sort_first_epoch(next, &stack); if (reversed) { /* |