Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Remove bogus dup commit warning with --merge-order
author
Linus Torvalds
<torvalds@ppc970.osdl.org>
Wed, 29 Jun 2005 18:40:58 +0000
(11:40 -0700)
committer
Linus Torvalds
<torvalds@ppc970.osdl.org>
Wed, 29 Jun 2005 18:40:58 +0000
(11:40 -0700)
It makes gitk unhappy, and besides, non-merge-order doesn't complain, so
why do it here..
epoch.c
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
36f8d17
)
diff --git
a/epoch.c
b/epoch.c
index cbbc418c146c9fe4d6723b6548ff7bef0fb2cc6c..904cc0d4b89db2307d137a474ab8f555ab67ea12 100644
(file)
--- 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)) {
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);
}
next->object.flags |= DUPCHECK;
commit_list_insert(list->item, &reversed);
}