Browse Source

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..
maint
Linus Torvalds 20 years ago
parent
commit
ad6ce07c44
  1. 5
      epoch.c

5
epoch.c

@ -586,10 +586,7 @@ int sort_list_in_merge_order(struct commit_list *list, emitter_func emitter) @@ -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);
}

Loading…
Cancel
Save