From mboxrd@z Thu Jan 1 00:00:00 1970 From: Pierre Habouzit Subject: [PATCH 2/3] parse-opt: migrate git-merge-base. Date: Wed, 1 Oct 2008 08:05:05 +0200 Message-ID: <1222841106-26148-2-git-send-email-madcoder@debian.org> References: <20080930224623.GQ21310@spearce.org> <1222841106-26148-1-git-send-email-madcoder@debian.org> Cc: git@vger.kernel.org, gitster@pobox.com, Pierre Habouzit To: spearce@spearce.org X-From: git-owner@vger.kernel.org Wed Oct 01 08:06:34 2008 connect(): Connection refused Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1Kkuqz-0000sL-Jm for gcvg-git-2@gmane.org; Wed, 01 Oct 2008 08:06:30 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752052AbYJAGFQ (ORCPT ); Wed, 1 Oct 2008 02:05:16 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752038AbYJAGFQ (ORCPT ); Wed, 1 Oct 2008 02:05:16 -0400 Received: from pan.madism.org ([88.191.52.104]:50327 "EHLO hermes.madism.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751850AbYJAGFP (ORCPT ); Wed, 1 Oct 2008 02:05:15 -0400 Received: from madism.org (olympe.madism.org [82.243.245.108]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "artemis.madism.org", Issuer "madism.org" (verified OK)) by hermes.madism.org (Postfix) with ESMTPS id 56D443BA2C; Wed, 1 Oct 2008 08:05:13 +0200 (CEST) Received: by madism.org (Postfix, from userid 1000) id 8690B2ACE1; Wed, 1 Oct 2008 08:05:06 +0200 (CEST) X-Mailer: git-send-email 1.6.0.2.415.g9800c0.dirty In-Reply-To: <1222841106-26148-1-git-send-email-madcoder@debian.org> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Signed-off-by: Pierre Habouzit --- builtin-merge-base.c | 37 ++++++++++++++++--------------------- 1 files changed, 16 insertions(+), 21 deletions(-) diff --git a/builtin-merge-base.c b/builtin-merge-base.c index b08da51..03fc1c2 100644 --- a/builtin-merge-base.c +++ b/builtin-merge-base.c @@ -1,6 +1,7 @@ #include "builtin.h" #include "cache.h" #include "commit.h" +#include "parse-options.h" static int show_merge_base(struct commit **rev, int rev_nr, int show_all) { @@ -21,8 +22,10 @@ static int show_merge_base(struct commit **rev, int rev_nr, int show_all) return 0; } -static const char merge_base_usage[] = -"git merge-base [--all] ..."; +static const char * const merge_base_usage[] = { + "git merge-base [--all] ...", + NULL +}; static struct commit *get_commit_reference(const char *arg) { @@ -44,25 +47,17 @@ int cmd_merge_base(int argc, const char **argv, const char *prefix) int rev_nr = 0; int show_all = 0; - git_config(git_default_config, NULL); - - while (1 < argc && argv[1][0] == '-') { - const char *arg = argv[1]; - if (!strcmp(arg, "-a") || !strcmp(arg, "--all")) - show_all = 1; - else - usage(merge_base_usage); - argc--; argv++; - } - if (argc < 3) - usage(merge_base_usage); - - rev = xmalloc((argc - 1) * sizeof(*rev)); - - do { - rev[rev_nr++] = get_commit_reference(argv[1]); - argc--; argv++; - } while (argc > 1); + struct option options[] = { + OPT_BOOLEAN('a', "all", &show_all, "outputs all common ancestors"), + OPT_END() + }; + git_config(git_default_config, NULL); + argc = parse_options(argc, argv, options, merge_base_usage, 0); + if (argc < 2) + usage_with_options(merge_base_usage, options); + rev = xmalloc(argc * sizeof(*rev)); + while (argc-- > 0) + rev[rev_nr++] = get_commit_reference(*argv++); return show_merge_base(rev, rev_nr, show_all); } -- 1.6.0.2.415.g9800c0.dirty