diff options
author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-29 11:40:58 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-29 11:40:58 -0700 |
commit | ad6ce07c44c8f76599d506d38cc3194e886e694a (patch) | |
tree | d118ff95b336ed3ef07094dbbdec754574a5ddbf /epoch.c | |
parent | 36f8d17445087a59d81963520ded982e03dfb6cb (diff) | |
download | git-ad6ce07c44c8f76599d506d38cc3194e886e694a.tar.gz git-ad6ce07c44c8f76599d506d38cc3194e886e694a.tar.xz |
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.c | 5 |
1 files changed, 1 insertions, 4 deletions
@@ -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); } |