[PATCH 2/2] Fix to how --merge-order handles multiple roots
- From
Jon Seymour <jon.seymour@gmail.com>
- Date
- Jun 23, 2005, 02:01 UTC
- Message-ID
- <20050623020112.16423.qmail@blackcubes.dyndns.org>
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> ---
epoch.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/epoch.c b/epoch.c --- a/epoch.c +++ b/epoch.c @@ -488,7 +488,7 @@ static void sort_first_epoch(struct comm * * 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 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 co } 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 comm } } - action = emit_stack(&stack, emitter); + action = emit_stack(&stack, emitter, (base==NULL)); } if (base && (action != STOP)) { ------------