diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-06-13 22:22:39 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-06-13 22:22:39 +0400 |
commit | 2d4fef9b86f41ad929f533e0e52dc1a6048cc2a3 (patch) | |
tree | 892c4c4b0194c611899f6d3c2c2fcfd8a346a974 /builtin | |
parent | cde3eadad2fcacc90792a31d0c2ed6890f373e63 (diff) | |
parent | a9f2adff802308481f2e638bae0c5b6e205251a3 (diff) |
Merge branch 'mg/notes-dry-run'
* mg/notes-dry-run:
notes: dry-run and verbose options for prune
Diffstat (limited to 'builtin')
-rw-r--r-- | builtin/notes.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/builtin/notes.c b/builtin/notes.c index 52b72fca68..ba8fd178c8 100644 --- a/builtin/notes.c +++ b/builtin/notes.c @@ -26,7 +26,7 @@ static const char * const git_notes_usage[] = { "git notes [--ref <notes_ref>] edit [<object>]", "git notes [--ref <notes_ref>] show [<object>]", "git notes [--ref <notes_ref>] remove [<object>]", - "git notes [--ref <notes_ref>] prune", + "git notes [--ref <notes_ref>] prune [-n | -v]", NULL }; @@ -67,7 +67,7 @@ static const char * const git_notes_remove_usage[] = { }; static const char * const git_notes_prune_usage[] = { - "git notes prune", + "git notes prune [<options>]", NULL }; @@ -792,7 +792,10 @@ static int remove_cmd(int argc, const char **argv, const char *prefix) 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_END() }; @@ -806,8 +809,10 @@ static int prune(int argc, const char **argv, const char *prefix) t = init_notes_check("prune"); - prune_notes(t); - commit_notes(t, "Notes removed by 'git notes prune'"); + prune_notes(t, (verbose ? NOTES_PRUNE_VERBOSE : 0) | + (show_only ? NOTES_PRUNE_VERBOSE|NOTES_PRUNE_DRYRUN : 0) ); + if (!show_only) + commit_notes(t, "Notes removed by 'git notes prune'"); free_notes(t); return 0; } |