From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Wed, 29 Jun 2005 18:40:58 +0000 (-0700)
Subject: Remove bogus dup commit warning with --merge-order
X-Git-Tag: v0.99~121
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=ad6ce07c44c8f76599d506d38cc3194e886e694a;p=git.git

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..
---

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);
 			}