index a7e84fc59a0927334747effc8d41138a8569a96d..904cc0d4b89db2307d137a474ab8f555ab67ea12 100644 (file)
--- a/epoch.c
+++ b/epoch.c
*
* 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;
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;
}
}
struct commit *next = list->item;
if (!(next->object.flags & UNINTERESTING)) {
- if (next->object.flags & DUPCHECK) {
- fprintf(stderr, "%s: duplicate commit %s ignored\n",
- __FUNCTION__, sha1_to_hex(next->object.sha1));
- } else {
+ if (!(next->object.flags & DUPCHECK)) {
next->object.flags |= DUPCHECK;
commit_list_insert(list->item, &reversed);
}
}
}
- action = emit_stack(&stack, emitter);
+ action = emit_stack(&stack, emitter, (base==NULL));
}
if (base && (action != STOP)) {