From 8cd1033e10b3d51d19676902bf522be15eb95751 Mon Sep 17 00:00:00 2001 From: Jon Seymour Date: Mon, 20 Jun 2005 12:29:29 +1000 Subject: [PATCH] [PATCH] Tweaked --merge-order --show-breaks output in case specified head has no parent git-rev-list --merge-order --show-breaks root Was outputing: | root It now outputs: = root Which is consistent with the behaviour of other cases. Signed-off-by: Jon Seymour Signed-off-by: Linus Torvalds --- epoch.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epoch.c b/epoch.c index a4c82135b..5b71ad50d 100644 --- a/epoch.c +++ b/epoch.c @@ -536,6 +536,8 @@ static int sort_in_merge_order(struct commit *head_of_epoch, emitter_func emitte ret = parse_commit(head_of_epoch); + next->object.flags |= BOUNDARY; + while (next && next->parents && !ret && (action != STOP)) { struct commit *base = NULL; -- 2.30.2