summaryrefslogtreecommitdiff
path: root/epoch.c
diff options
context:
space:
mode:
authorJon Seymour <jon.seymour@gmail.com>2005-07-06 16:39:35 (GMT)
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-06 17:29:30 (GMT)
commitff9206e72c71aa2e51c7cbee911f47b5838a5845 (patch)
treed4f74f740dfcb97670df7b69e64b252149db2bfb /epoch.c
parent4d3a63ba3a1f80e03312c5ec28734b27583a0756 (diff)
downloadgit-ff9206e72c71aa2e51c7cbee911f47b5838a5845.zip
git-ff9206e72c71aa2e51c7cbee911f47b5838a5845.tar.gz
git-ff9206e72c71aa2e51c7cbee911f47b5838a5845.tar.bz2
[PATCH] Fixes a problem with --merge-order A B (A is linear descendent of a merge B)
This patch passes the test case introduced by the previous patch. 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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/epoch.c b/epoch.c
index 7888f1d..01fe8e4 100644
--- a/epoch.c
+++ b/epoch.c
@@ -606,7 +606,7 @@ int sort_list_in_merge_order(struct commit_list *list, emitter_func emitter)
while (reversed) {
struct commit * next = pop_commit(&reversed);
- if (!(next->object.flags & VISITED)) {
+ if (!(next->object.flags & VISITED) && next!=base) {
sort_first_epoch(next, &stack);
if (reversed) {
/*