mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove bogus dup commit warning with --merge-order

Browse Source 
It makes gitk unhappy, and besides, non-merge-order doesn't complain, so
why do it here..
This commit is contained in:
Linus Torvalds 2005-06-29 11:40:58 -07:00
parent 36f8d17445
commit ad6ce07c44
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
epoch.c
View File

@ -586,10 +586,7 @@ int sort_list_in_merge_order(struct commit_list *list, emitter_func emitter)
struct commit *next = list->item; struct commit *next = list->item;
if (!(next->object.flags & UNINTERESTING)) { if (!(next->object.flags & UNINTERESTING)) {
if (next->object.flags & DUPCHECK) { if (!(next->object.flags & DUPCHECK)) {
fprintf(stderr, "%s: duplicate commit %s ignored\n",
__FUNCTION__, sha1_to_hex(next->object.sha1));
} else {
next->object.flags |= DUPCHECK; next->object.flags |= DUPCHECK;
commit_list_insert(list->item, &reversed); commit_list_insert(list->item, &reversed);
} }