From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?ISO-8859-15?Q?Ren=E9_Scharfe?= Subject: [PATCH 2/7] add description parameter to OPT__DRY_RUN Date: Mon, 08 Nov 2010 18:58:51 +0100 Message-ID: <4CD83A5B.1010601@lsrfire.ath.cx> References: <4CD83917.3040801@lsrfire.ath.cx> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Cc: Junio C Hamano To: Git Mailing List X-From: git-owner@vger.kernel.org Mon Nov 08 18:59:12 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 1PFVzs-0002eW-AC for gcvg-git-2@lo.gmane.org; Mon, 08 Nov 2010 18:59:12 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755325Ab0KHR7A (ORCPT ); Mon, 8 Nov 2010 12:59:00 -0500 Received: from india601.server4you.de ([85.25.151.105]:47810 "EHLO india601.server4you.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755301Ab0KHR65 (ORCPT ); Mon, 8 Nov 2010 12:58:57 -0500 Received: from [10.0.1.100] (p4FC56F37.dip.t-dialin.net [79.197.111.55]) by india601.server4you.de (Postfix) with ESMTPSA id 07D4B2F807B; Mon, 8 Nov 2010 18:58:55 +0100 (CET) User-Agent: Mozilla/5.0 (Windows; U; Windows NT 6.0; de; rv:1.9.2.12) Gecko/20101027 Thunderbird/3.1.6 In-Reply-To: <4CD83917.3040801@lsrfire.ath.cx> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Allows better help text to be defined than "dry run". Also make use of the macro in places that already had a different description. No object code changes intended. Signed-off-by: Rene Scharfe --- Documentation/technical/api-parse-options.txt | 2 +- builtin/add.c | 2 +- builtin/clean.c | 2 +- builtin/mv.c | 2 +- builtin/notes.c | 3 +-- builtin/prune.c | 3 +-- builtin/remote.c | 2 +- builtin/rm.c | 2 +- parse-options.h | 2 +- test-parse-options.c | 2 +- 10 files changed, 10 insertions(+), 12 deletions(-) diff --git a/Documentation/technical/api-parse-options.txt b/Documentation/technical/api-parse-options.txt index 969489b..00c447c 100644 --- a/Documentation/technical/api-parse-options.txt +++ b/Documentation/technical/api-parse-options.txt @@ -118,7 +118,7 @@ There are some macros to easily define options: `OPT__COLOR(&int_var, description)`:: Add `\--color[=]` and `--no-color`. -`OPT__DRY_RUN(&int_var)`:: +`OPT__DRY_RUN(&int_var, description)`:: Add `-n, \--dry-run`. `OPT__QUIET(&int_var)`:: diff --git a/builtin/add.c b/builtin/add.c index fbf1403..9625cee 100644 --- a/builtin/add.c +++ b/builtin/add.c @@ -313,7 +313,7 @@ static int verbose = 0, show_only = 0, ignored_too = 0, refresh_only = 0; static int ignore_add_errors, addremove, intent_to_add, ignore_missing = 0; static struct option builtin_add_options[] = { - OPT__DRY_RUN(&show_only), + OPT__DRY_RUN(&show_only, "dry run"), OPT__VERBOSE(&verbose, "be verbose"), OPT_GROUP(""), OPT_BOOLEAN('i', "interactive", &add_interactive, "interactive picking"), diff --git a/builtin/clean.c b/builtin/clean.c index c8798f5..17ecbe6 100644 --- a/builtin/clean.c +++ b/builtin/clean.c @@ -49,7 +49,7 @@ int cmd_clean(int argc, const char **argv, const char *prefix) char *seen = NULL; struct option options[] = { OPT__QUIET(&quiet), - OPT__DRY_RUN(&show_only), + OPT__DRY_RUN(&show_only, "dry run"), OPT_BOOLEAN('f', "force", &force, "force"), OPT_BOOLEAN('d', NULL, &remove_directories, "remove whole directories"), diff --git a/builtin/mv.c b/builtin/mv.c index cdbb094..8677bd2 100644 --- a/builtin/mv.c +++ b/builtin/mv.c @@ -55,7 +55,7 @@ int cmd_mv(int argc, const char **argv, const char *prefix) int i, newfd; int verbose = 0, show_only = 0, force = 0, ignore_errors = 0; struct option builtin_mv_options[] = { - OPT__DRY_RUN(&show_only), + OPT__DRY_RUN(&show_only, "dry run"), OPT_BOOLEAN('f', "force", &force, "force move/rename even if target exists"), OPT_BOOLEAN('k', NULL, &ignore_errors, "skip move/rename errors"), OPT_END(), diff --git a/builtin/notes.c b/builtin/notes.c index e0a1f62..2ab070f 100644 --- a/builtin/notes.c +++ b/builtin/notes.c @@ -804,8 +804,7 @@ static int prune(int argc, const char **argv, const char *prefix) struct notes_tree *t; int show_only = 0, verbose = 0; struct option options[] = { - OPT_BOOLEAN('n', "dry-run", &show_only, - "do not remove, show only"), + OPT__DRY_RUN(&show_only, "do not remove, show only"), OPT__VERBOSE(&verbose, "report pruned notes"), OPT_END() }; diff --git a/builtin/prune.c b/builtin/prune.c index 8b770af..e65690b 100644 --- a/builtin/prune.c +++ b/builtin/prune.c @@ -125,8 +125,7 @@ int cmd_prune(int argc, const char **argv, const char *prefix) { struct rev_info revs; const struct option options[] = { - OPT_BOOLEAN('n', "dry-run", &show_only, - "do not remove, show only"), + OPT__DRY_RUN(&show_only, "do not remove, show only"), OPT__VERBOSE(&verbose, "report pruned objects"), OPT_DATE(0, "expire", &expire, "expire objects older than