From: Jon Seymour <jon.seymour@gmail.com>
Date: Mon, 20 Jun 2005 02:29:29 +0000 (+1000)
Subject: [PATCH] Tweaked --merge-order --show-breaks output in case specified head has no... 
X-Git-Tag: v0.99~239
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8cd1033e10b3d51d19676902bf522be15eb95751;p=git.git

[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 <jon.seymour@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

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;