diff options
| author | René Scharfe <rene.scharfe@lsrfire.ath.cx> | 2010-11-08 18:58:51 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-15 09:57:37 -0800 |
| commit | e21adb8c100cd2859cff1d74f7d0e622ac640085 (patch) | |
| tree | 0dc6a3b9858d1c472ad153430950b0c638b2cc3e /builtin | |
| parent | fd03881a48fc31197ab3343ac2f02ed0cdbbbaaf (diff) | |
| download | git-e21adb8c100cd2859cff1d74f7d0e622ac640085.tar.gz | |
add description parameter to OPT__DRY_RUN
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 <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/add.c | 2 | ||||
| -rw-r--r-- | builtin/clean.c | 2 | ||||
| -rw-r--r-- | builtin/mv.c | 2 | ||||
| -rw-r--r-- | builtin/notes.c | 3 | ||||
| -rw-r--r-- | builtin/prune.c | 3 | ||||
| -rw-r--r-- | builtin/remote.c | 2 | ||||
| -rw-r--r-- | builtin/rm.c | 2 |
7 files changed, 7 insertions, 9 deletions
diff --git a/builtin/add.c b/builtin/add.c index fbf14035c3..9625ceeb5b 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 c8798f549e..17ecbe6eea 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 cdbb09473c..8677bd2e40 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 e0a1f62fc9..2ab070fa09 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 8b770affff..e65690ba37 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 <time>"), diff --git a/builtin/remote.c b/builtin/remote.c index b944b91056..30b992275a 100644 --- a/builtin/remote.c +++ b/builtin/remote.c @@ -1200,7 +1200,7 @@ static int prune(int argc, const char **argv) { int dry_run = 0, result = 0; struct option options[] = { - OPT__DRY_RUN(&dry_run), + OPT__DRY_RUN(&dry_run, "dry run"), OPT_END() }; diff --git a/builtin/rm.c b/builtin/rm.c index f3772c84de..26b7412aaa 100644 --- a/builtin/rm.c +++ b/builtin/rm.c @@ -139,7 +139,7 @@ static int show_only = 0, force = 0, index_only = 0, recursive = 0, quiet = 0; static int ignore_unmatch = 0; static struct option builtin_rm_options[] = { - OPT__DRY_RUN(&show_only), + OPT__DRY_RUN(&show_only, "dry run"), OPT__QUIET(&quiet), OPT_BOOLEAN( 0 , "cached", &index_only, "only remove from the index"), OPT_BOOLEAN('f', "force", &force, "override the up-to-date check"), |