From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= Subject: [PATCH 2/3] builtins: utilize startup_info->help where possible Date: Tue, 19 Oct 2010 20:35:19 +0700 Message-ID: <1287495320-27278-2-git-send-email-pclouds@gmail.com> References: <1287495320-27278-1-git-send-email-pclouds@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= To: git@vger.kernel.org, Junio C Hamano X-From: git-owner@vger.kernel.org Tue Oct 19 15:36:17 2010 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1P8CMF-0000Tq-BH for gcvg-git-2@lo.gmane.org; Tue, 19 Oct 2010 15:36:04 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758702Ab0JSNfs (ORCPT ); Tue, 19 Oct 2010 09:35:48 -0400 Received: from mail-pw0-f46.google.com ([209.85.160.46]:61649 "EHLO mail-pw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758670Ab0JSNfr (ORCPT ); Tue, 19 Oct 2010 09:35:47 -0400 Received: by pwj4 with SMTP id 4so441958pwj.19 for ; Tue, 19 Oct 2010 06:35:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:received:from:to:cc:subject :date:message-id:x-mailer:in-reply-to:references:mime-version :content-type:content-transfer-encoding; bh=1M29YZoL7D5Jdt+tZBDqLYXOUJiWXjUJPBxg3FjxPIk=; b=QvLaO454b7UPZLxtqvad6VnYyDuUkHQe3FaBffaD8ivXUGpgZm4sqr19w0LGaj6sFp 6/oONIJ8OOgMXmLSw2OBLEyRvLmehQFvKEkDC/4Ag301lj18XDiDi7er0wA32CdPtUqA Iqn/EVtAnc8RqX2yow7qqMRiy1Ztlp3F5n2DE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :mime-version:content-type:content-transfer-encoding; b=ecHF3ArdRf2dd986v3zKBMHVDMV+REiAacalq7Zc+ANpDMEoVLKgEaoGEaKtnb18LQ qLxQ5lubPt5cyzNZx7kF5qDUbwpOtkWtXyxAuQ06aSv0OWA/lXv6XMzCROhGj4vu64TY gk3NJLQOkXY12B16K22shsbUfCglnUkMUbwJE= Received: by 10.142.217.14 with SMTP id p14mr4645887wfg.334.1287495346749; Tue, 19 Oct 2010 06:35:46 -0700 (PDT) Received: from pclouds@gmail.com ([115.73.198.15]) by mx.google.com with ESMTPS id e36sm21380485wfj.14.2010.10.19.06.35.37 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 19 Oct 2010 06:35:42 -0700 (PDT) Received: by pclouds@gmail.com (sSMTP sendmail emulation); Tue, 19 Oct 2010 20:35:31 +0700 X-Mailer: git-send-email 1.7.0.2.445.gcbdb3 In-Reply-To: <1287495320-27278-1-git-send-email-pclouds@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: It helps reduce false alarms while I'm looking for "git foo -h" code path that accesses repository. Anyway it looks like a good thing to do. --- builtin/check-ref-format.c | 2 +- builtin/grep.c | 2 +- builtin/index-pack.c | 2 +- builtin/log.c | 6 +----- builtin/merge-ours.c | 2 +- builtin/pack-redundant.c | 2 +- builtin/show-ref.c | 2 +- 7 files changed, 7 insertions(+), 11 deletions(-) diff --git a/builtin/check-ref-format.c b/builtin/check-ref-format.c index ae3f281..c6511e3 100644 --- a/builtin/check-ref-format.c +++ b/builtin/check-ref-format.c @@ -58,7 +58,7 @@ static int check_ref_format_print(const char *arg) int cmd_check_ref_format(int argc, const char **argv, const char *prefix) { - if (argc == 2 && !strcmp(argv[1], "-h")) + if (startup_info->help) usage(builtin_check_ref_format_usage); if (argc == 3 && !strcmp(argv[1], "--branch")) diff --git a/builtin/grep.c b/builtin/grep.c index da32f3d..ec39909 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -934,7 +934,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix) * 'git grep -h', unlike 'git grep -h ', is a request * to show usage information and exit. */ - if (argc == 2 && !strcmp(argv[1], "-h")) + if (startup_info->help) usage_with_options(grep_usage, options); memset(&opt, 0, sizeof(opt)); diff --git a/builtin/index-pack.c b/builtin/index-pack.c index e243d9d..649ad18 100644 --- a/builtin/index-pack.c +++ b/builtin/index-pack.c @@ -881,7 +881,7 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix) struct pack_idx_entry **idx_objects; unsigned char pack_sha1[20]; - if (argc == 2 && !strcmp(argv[1], "-h")) + if (startup_info->help) usage(index_pack_usage); read_replace_refs = 0; diff --git a/builtin/log.c b/builtin/log.c index 22d1290..a7ba9ed 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -69,11 +69,7 @@ static void cmd_log_init(int argc, const char **argv, const char *prefix, if (default_date_mode) rev->date_mode = parse_date_format(default_date_mode); - /* - * Check for -h before setup_revisions(), or "git log -h" will - * fail when run without a git directory. - */ - if (argc == 2 && !strcmp(argv[1], "-h")) + if (startup_info->help) usage(builtin_log_usage); argc = setup_revisions(argc, argv, rev, opt); diff --git a/builtin/merge-ours.c b/builtin/merge-ours.c index 6844116..8e0777b 100644 --- a/builtin/merge-ours.c +++ b/builtin/merge-ours.c @@ -20,7 +20,7 @@ static const char *diff_index_args[] = { int cmd_merge_ours(int argc, const char **argv, const char *prefix) { - if (argc == 2 && !strcmp(argv[1], "-h")) + if (startup_info->help) usage(builtin_merge_ours_usage); /* diff --git a/builtin/pack-redundant.c b/builtin/pack-redundant.c index 41e1615..3f090b2 100644 --- a/builtin/pack-redundant.c +++ b/builtin/pack-redundant.c @@ -601,7 +601,7 @@ int cmd_pack_redundant(int argc, const char **argv, const char *prefix) unsigned char *sha1; char buf[42]; /* 40 byte sha1 + \n + \0 */ - if (argc == 2 && !strcmp(argv[1], "-h")) + if (startup_info->help) usage(pack_redundant_usage); for (i = 1; i < argc; i++) { diff --git a/builtin/show-ref.c b/builtin/show-ref.c index be9b512..7083fa9 100644 --- a/builtin/show-ref.c +++ b/builtin/show-ref.c @@ -204,7 +204,7 @@ static const struct option show_ref_options[] = { int cmd_show_ref(int argc, const char **argv, const char *prefix) { - if (argc == 2 && !strcmp(argv[1], "-h")) + if (startup_info->help) usage_with_options(show_ref_usage, show_ref_options); argc = parse_options(argc, argv, prefix, show_ref_options, -- 1.7.0.2.445.gcbdb3