From ad6ce07c44c8f76599d506d38cc3194e886e694a Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Wed, 29 Jun 2005 11:40:58 -0700 Subject: [PATCH] Remove bogus dup commit warning with --merge-order It makes gitk unhappy, and besides, non-merge-order doesn't complain, so why do it here.. --- epoch.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/epoch.c b/epoch.c index cbbc418c..904cc0d4 100644 --- a/epoch.c +++ b/epoch.c @@ -586,10 +586,7 @@ int sort_list_in_merge_order(struct commit_list *list, emitter_func emitter) 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); } -- 2.11.0