From: René Scharfe Date: Fri, 6 Aug 2010 20:28:09 +0000 (+0200) Subject: notes: allow --dry-run for -n and --verbose for -v X-Git-Tag: v1.7.2.2~20 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e93487d2f007176804e89042f9f199628e45c864;p=git.git notes: allow --dry-run for -n and --verbose for -v For consistency with other git commands, let the prune subcommand of git notes accept the long options --dry-run and --verbose for the respective short ones -n and -v. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano --- diff --git a/Documentation/git-notes.txt b/Documentation/git-notes.txt index 5540af5d1..2981d8c5e 100644 --- a/Documentation/git-notes.txt +++ b/Documentation/git-notes.txt @@ -129,10 +129,12 @@ OPTIONS is taken to be in `refs/notes/` if it is not qualified. -n:: +--dry-run:: Do not remove anything; just report the object names whose notes would be removed. -v:: +--verbose:: Report all object names whose notes are removed. diff --git a/builtin/notes.c b/builtin/notes.c index 190005f3c..fbc347c9f 100644 --- a/builtin/notes.c +++ b/builtin/notes.c @@ -798,8 +798,9 @@ 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', NULL, &show_only, "do not remove, show only"), - OPT_BOOLEAN('v', NULL, &verbose, "report pruned notes"), + OPT_BOOLEAN('n', "dry-run", &show_only, + "do not remove, show only"), + OPT_BOOLEAN('v', "verbose", &verbose, "report pruned notes"), OPT_END() };