notes remove: allow removing more than one

While "xargs -n1 git notes rm" is certainly a possible way to remove notes
from many objects, this would create one notes "commit" per removal, which
is not quite suitable for seasonal housekeeping.

Allow taking more than one on the command line, and record their removal
as a single atomic event if everthing goes well.

Even though the old code insisted that "git notes rm" must be given only
one object (or zero, in which case it would default to HEAD), this
condition was not tested. Add tests to handle the new case where we feed
multiple objects, and also make sure if there is a bad input, no change
is recorded.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-notes.txt b/Documentation/git-notes.txt
index 913ecd8c433b7ebaaf932dd5cf9b789dc06b7b95..e2e1c4c88de04a951bd0baa1de76ed391b00d512 100644 (file)
--- a/Documentation/git-notes.txt
+++ b/Documentation/git-notes.txt
@@ -17,7 +17,7 @@ SYNOPSIS
 'git notes' merge [-v | -q] [-s <strategy> ] <notes_ref>
 'git notes' merge --commit [-v | -q]
 'git notes' merge --abort [-v | -q]
 'git notes' merge [-v | -q] [-s <strategy> ] <notes_ref>
 'git notes' merge --commit [-v | -q]
 'git notes' merge --abort [-v | -q]

-'git notes' remove [<object>]
+'git notes' remove [<object>...]

 'git notes' prune [-n | -v]
 'git notes' get-ref
 
 'git notes' prune [-n | -v]
 'git notes' get-ref
 


@@ -106,8 +106,9 @@ When done, the user can either finalize the merge with
 'git notes merge --abort'.
 
 remove::
 'git notes merge --abort'.
 
 remove::

-       Remove the notes for a given object (defaults to HEAD).
-       This is equivalent to specifying an empty note message to
+       Remove the notes for given objects (defaults to HEAD). When
+       giving zero or one object from the command line, this is
+       equivalent to specifying an empty note message to

        the `edit` subcommand.
 
 prune::
        the `edit` subcommand.
 
 prune::

diff --git a/builtin/notes.c b/builtin/notes.c
index 1fb1f734397668280b444e63dc8d3c129d41e3b9..30cee0fd3cf0713502eb7d47c683b7186069bc61 100644 (file)
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@ -29,7 +29,7 @@ static const char * const git_notes_usage[] = {
        "git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>",
        "git notes merge --commit [-v | -q]",
        "git notes merge --abort [-v | -q]",
        "git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>",
        "git notes merge --commit [-v | -q]",
        "git notes merge --abort [-v | -q]",

-       "git notes [--ref <notes_ref>] remove [<object>]",
+       "git notes [--ref <notes_ref>] remove [<object>...]",

        "git notes [--ref <notes_ref>] prune [-n | -v]",
        "git notes [--ref <notes_ref>] get-ref",
        NULL
        "git notes [--ref <notes_ref>] prune [-n | -v]",
        "git notes [--ref <notes_ref>] get-ref",
        NULL


@@ -953,40 +953,43 @@ static int merge(int argc, const char **argv, const char *prefix)
        return result < 0; /* return non-zero on conflicts */
 }
 
        return result < 0; /* return non-zero on conflicts */
 }
 

+static int remove_one_note(struct notes_tree *t, const char *name)
+{
+       int status;
+       unsigned char sha1[20];
+       if (get_sha1(name, sha1))
+               return error(_("Failed to resolve '%s' as a valid ref."), name);
+       status = remove_note(t, sha1);
+       if (status)
+               fprintf(stderr, _("Object %s has no note\n"), name);
+       else
+               fprintf(stderr, _("Removing note for object %s\n"), name);
+       return status;
+}
+

 static int remove_cmd(int argc, const char **argv, const char *prefix)
 {
        struct option options[] = {
                OPT_END()
        };
 static int remove_cmd(int argc, const char **argv, const char *prefix)
 {
        struct option options[] = {
                OPT_END()
        };

-       const char *object_ref;

        struct notes_tree *t;
        struct notes_tree *t;

-       unsigned char object[20];
-       int retval;
+       int retval = 0;

 
        argc = parse_options(argc, argv, prefix, options,
                             git_notes_remove_usage, 0);
 
 
        argc = parse_options(argc, argv, prefix, options,
                             git_notes_remove_usage, 0);
 

-       if (1 < argc) {
-               error(_("too many parameters"));
-               usage_with_options(git_notes_remove_usage, options);
-       }
-
-       object_ref = argc ? argv[0] : "HEAD";
-
-       if (get_sha1(object_ref, object))
-               die(_("Failed to resolve '%s' as a valid ref."), object_ref);
-

        t = init_notes_check("remove");
 
        t = init_notes_check("remove");
 

-       retval = remove_note(t, object);
-       if (retval)
-               fprintf(stderr, _("Object %s has no note\n"), sha1_to_hex(object));
-       else {
-               fprintf(stderr, _("Removing note for object %s\n"),
-                       sha1_to_hex(object));
-
-               commit_notes(t, "Notes removed by 'git notes remove'");
+       if (!argc) {
+               retval = remove_one_note(t, "HEAD");
+       } else {
+               while (*argv) {
+                       retval |= remove_one_note(t, *argv);
+                       argv++;
+               }

        }
        }

+       if (!retval)
+               commit_notes(t, "Notes removed by 'git notes remove'");

        free_notes(t);
        return retval;
 }
        free_notes(t);
        return retval;
 }

diff --git a/t/t3301-notes.sh b/t/t3301-notes.sh
index 28e17c8920cbe9f2b13ff5cc30939eab8171bae2..f49879e034de847cf249b5d4aa507fd62d4abf64 100755 (executable)
--- a/t/t3301-notes.sh
+++ b/t/t3301-notes.sh
@@ -435,6 +435,26 @@ test_expect_success 'removing non-existing note should not create new commit' '
        test_cmp before_commit after_commit
 '
 
        test_cmp before_commit after_commit
 '
 

+test_expect_success 'removing more than one' '
+       before=$(git rev-parse --verify refs/notes/commits) &&
+       test_when_finished "git update-ref refs/notes/commits $before" &&
+
+       # We have only two -- add another and make sure it stays
+       git notes add -m "extra" &&
+       git notes list HEAD >after-removal-expect &&
+       git notes remove HEAD^^ HEAD^^^ &&
+       git notes list | sed -e "s/ .*//" >actual &&
+       test_cmp after-removal-expect actual
+'
+
+test_expect_success 'removing is atomic' '
+       before=$(git rev-parse --verify refs/notes/commits) &&
+       test_when_finished "git update-ref refs/notes/commits $before" &&
+       test_must_fail git notes remove HEAD^^ HEAD^^^ HEAD^ &&
+       after=$(git rev-parse --verify refs/notes/commits) &&
+       test "$before" = "$after"
+'
+

 test_expect_success 'list notes with "git notes list"' '
        git notes list > output &&
        test_cmp expect output
 test_expect_success 'list notes with "git notes list"' '
        git notes list > output &&
        test_cmp expect output