From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jon Seymour Subject: [PATCH 1/13] Temporary fixup to rev-list.c to restore expected order of arguments presented to --merge-order sort. Date: Thu, 07 Jul 2005 02:39:34 +1000 Message-ID: <20050706163934.9811.qmail@blackcubes.dyndns.org> Cc: torvalds@osdl.org, jon.seymour@gmail.com X-From: git-owner@vger.kernel.org Wed Jul 06 18:57:11 2005 Return-path: Received: from vger.kernel.org ([12.107.209.244]) by ciao.gmane.org with esmtp (Exim 4.43) id 1DqDCR-0007UL-N9 for gcvg-git@gmane.org; Wed, 06 Jul 2005 18:56:40 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S262379AbVGFQzM (ORCPT ); Wed, 6 Jul 2005 12:55:12 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S262373AbVGFQxA (ORCPT ); Wed, 6 Jul 2005 12:53:00 -0400 Received: from 203-217-64-103.dyn.iinet.net.au ([203.217.64.103]:14466 "HELO blackcubes.dyndns.org") by vger.kernel.org with SMTP id S262344AbVGFQjn (ORCPT ); Wed, 6 Jul 2005 12:39:43 -0400 Received: (qmail 9821 invoked by uid 500); 6 Jul 2005 16:39:34 -0000 To: git@vger.kernel.org Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org This patch adds a hacky special case to the rev-list main to restore the order in which the --merge-order sort algorithm receives arguments. A subsequent patch will abstract this out more cleanly. Signed-off-by: Jon Seymour --- rev-list.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) c63fe4678d33db15db076606f7a133868e91f1bc diff --git a/rev-list.c b/rev-list.c --- a/rev-list.c +++ b/rev-list.c @@ -482,7 +482,10 @@ int main(int argc, char **argv) commit = get_commit_reference(arg, flags); if (!commit) continue; - insert_by_date(&list, commit); + if (!merge_order) + insert_by_date(&list, commit); + else + commit_list_insert(commit, &list); } if (!merge_order) { ------------