summaryrefslogtreecommitdiff
path: root/epoch.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-29 18:40:58 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-29 18:40:58 (GMT)
commitad6ce07c44c8f76599d506d38cc3194e886e694a (patch)
treed118ff95b336ed3ef07094dbbdec754574a5ddbf /epoch.c
parent36f8d17445087a59d81963520ded982e03dfb6cb (diff)
downloadgit-ad6ce07c44c8f76599d506d38cc3194e886e694a.zip
git-ad6ce07c44c8f76599d506d38cc3194e886e694a.tar.gz
git-ad6ce07c44c8f76599d506d38cc3194e886e694a.tar.bz2
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..
Diffstat (limited to 'epoch.c')
-rw-r--r--epoch.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/epoch.c b/epoch.c
index cbbc418..904cc0d 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);
}