diff options
| author | Jon Seymour <jon.seymour@gmail.com> | 2005-06-23 12:01:12 +1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-22 19:15:04 -0700 |
| commit | 170774a39d32755fc013601d9d682ee034974625 (patch) | |
| tree | 592bcd41828f8893fe5503590a1b794ce42c6145 /epoch.c | |
| parent | 6e4c0a51092e3ec3429ca91890b99e198aa367bd (diff) | |
| download | git-170774a39d32755fc013601d9d682ee034974625.tar.gz git-170774a39d32755fc013601d9d682ee034974625.tar.xz | |
[PATCH] Fix to how --merge-order handles multiple roots
This patch addresses the problem reported by Paul Mackerras such that --merge-order
did not report the last root of a graph with merge of two independent roots.
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 | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -488,7 +488,7 @@ static void sort_first_epoch(struct commit *head, struct commit_list **stack) * * Sets the return value to STOP if no further output should be generated. */ -static int emit_stack(struct commit_list **stack, emitter_func emitter) +static int emit_stack(struct commit_list **stack, emitter_func emitter, int include_last) { unsigned int seen = 0; int action = CONTINUE; @@ -496,8 +496,11 @@ static int emit_stack(struct commit_list **stack, emitter_func emitter) while (*stack && (action != STOP)) { struct commit *next = pop_commit(stack); seen |= next->object.flags; - if (*stack) + if (*stack || include_last) { + if (!*stack) + next->object.flags |= BOUNDARY; action = (*emitter) (next); + } } if (*stack) { @@ -553,7 +556,7 @@ static int sort_in_merge_order(struct commit *head_of_epoch, emitter_func emitte } else { struct commit_list *stack = NULL; sort_first_epoch(next, &stack); - action = emit_stack(&stack, emitter); + action = emit_stack(&stack, emitter, (base == NULL)); next = base; } } @@ -636,7 +639,7 @@ int sort_list_in_merge_order(struct commit_list *list, emitter_func emitter) } } - action = emit_stack(&stack, emitter); + action = emit_stack(&stack, emitter, (base==NULL)); } if (base && (action != STOP)) { |