{"thread":{"id":"1108","subject":"[PATCH] Restore expected list order for --merge-order switch","startedAt":"2005-07-05T01:06:19Z","lastAt":"2005-07-05T23:43:47Z","messageCount":3,"participants":["Jon Seymour","Linus Torvalds"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"5656","messageId":"20050705010619.13581.qmail@blackcubes.dyndns.org","threadId":"1108","inReplyTo":null,"subject":"[PATCH] Restore expected list order for --merge-order switch","fromName":"Jon Seymour","fromEmail":"jon.seymour@gmail.com","sentAt":"2005-07-05T01:06:19Z","receivedAt":"2005-07-05T01:06:19Z","isPatch":true,"sender":{"key":"jon.seymour@gmail.com","avatar":"https://avatars.githubusercontent.com/u/207131?v=4"},"body":"\nA recent change to rev-list altered the order in which start points\nare presented to the merge-order sort algorithm. This caused\nbreaks in the t/t6001 unit tests.\n\nThis change restores the order in which start points are presented to the\nthe merge-order sort algorithm (but leaves the order unchanged from\nthe immediately preceding behaviour for non --merge-order sorts).\n\nThe order in which arguments are presented to the merge-order\nsort algorithm is significant, since left-most arguments\nare expected to sort last so as to be consistent with\nhow left-most parents sort.\n\nSigned-off-by: Jon Seymour <jon.seymour@gmail.com>\n---\n\n rev-list.c |    5 ++++-\n 1 files changed, 4 insertions(+), 1 deletions(-)\n\ned4451af196ea31ec0c6c7f663290a9b325482cd\ndiff --git a/rev-list.c b/rev-list.c\n--- a/rev-list.c\n+++ b/rev-list.c\n@@ -482,7 +482,10 @@ int main(int argc, char **argv)\n \t\tcommit = get_commit_reference(arg, flags);\n \t\tif (!commit)\n \t\t\tcontinue;\n-\t\tinsert_by_date(&list, commit);\n+\t\tif (!merge_order) \n+\t\t\tinsert_by_date(&list, commit);\n+\t\telse\n+\t\t\tcommit_list_insert(commit, &list);\n \t}\n \n \tif (!merge_order) {\t\t\n------------\n"},{"id":"5679","messageId":"2cfc403205070516216b911160@mail.gmail.com","threadId":"1108","inReplyTo":"20050705010619.13581.qmail@blackcubes.dyndns.org","subject":"Re: [PATCH] Restore expected list order for --merge-order switch","fromName":"Jon Seymour","fromEmail":"jon.seymour@gmail.com","sentAt":"2005-07-05T23:21:50Z","receivedAt":"2005-07-05T23:21:50Z","isPatch":true,"sender":{"key":"jon.seymour@gmail.com","avatar":"https://avatars.githubusercontent.com/u/207131?v=4"},"body":"G'day Linus,\n\nIs there some reason why this didn't get applied?\n\njon.\n\nOn 7/5/05, Jon Seymour <jon.seymour@gmail.com> wrote:\n> \n> A recent change to rev-list altered the order in which start points\n> are presented to the merge-order sort algorithm. This caused\n> breaks in the t/t6001 unit tests.\n> \n> This change restores the order in which start points are presented to the\n> the merge-order sort algorithm (but leaves the order unchanged from\n> the immediately preceding behaviour for non --merge-order sorts).\n> \n> The order in which arguments are presented to the merge-order\n> sort algorithm is significant, since left-most arguments\n> are expected to sort last so as to be consistent with\n> how left-most parents sort.\n> \n> Signed-off-by: Jon Seymour <jon.seymour@gmail.com>\n"},{"id":"5680","messageId":"Pine.LNX.4.58.0507051642490.3570@g5.osdl.org","threadId":"1108","inReplyTo":"2cfc403205070516216b911160@mail.gmail.com","subject":"Re: [PATCH] Restore expected list order for --merge-order switch","fromName":"Linus Torvalds","fromEmail":"torvalds@osdl.org","sentAt":"2005-07-05T23:43:47Z","receivedAt":"2005-07-05T23:43:47Z","isPatch":true,"sender":{"key":"torvalds@linux-foundation.org","avatar":"https://avatars.githubusercontent.com/u/1024025?v=4"},"body":"\n\nOn Wed, 6 Jul 2005, Jon Seymour wrote:\n> \n> Is there some reason why this didn't get applied?\n\nI think it's horribly horribly ugly. \n\nI really don't see the point of argument ordering mattering, and I think \nthe test is broken. Convince me otherwise.\n\n\t\tLinus\n"}]}