Merge branch 'maint'

diff --git a/builtin/notes.c b/builtin/notes.c
index 30cee0fd3cf0713502eb7d47c683b7186069bc61..f8e437db0156043f1586e66adf343e34ef6cf4dc 100644 (file)
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@ -953,7 +953,9 @@ static int merge(int argc, const char **argv, const char *prefix)
        return result < 0; /* return non-zero on conflicts */
 }
 
-static int remove_one_note(struct notes_tree *t, const char *name)
+#define IGNORE_MISSING 1
+
+static int remove_one_note(struct notes_tree *t, const char *name, unsigned flag)
 {
        int status;
        unsigned char sha1[20];
@@ -964,12 +966,19 @@ static int remove_one_note(struct notes_tree *t, const char *name)
                fprintf(stderr, _("Object %s has no note\n"), name);
        else
                fprintf(stderr, _("Removing note for object %s\n"), name);
-       return status;
+       return (flag & IGNORE_MISSING) ? 0 : status;
 }
 
 static int remove_cmd(int argc, const char **argv, const char *prefix)
 {
+       unsigned flag = 0;
+       int from_stdin = 0;
        struct option options[] = {
+               OPT_BIT(0, "ignore-missing", &flag,
+                       "attempt to remove non-existent note is not an error",
+                       IGNORE_MISSING),
+               OPT_BOOLEAN(0, "stdin", &from_stdin,
+                           "read object names from the standard input"),
                OPT_END()
        };
        struct notes_tree *t;
@@ -980,14 +989,22 @@ static int remove_cmd(int argc, const char **argv, const char *prefix)
 
        t = init_notes_check("remove");
 
-       if (!argc) {
-               retval = remove_one_note(t, "HEAD");
+       if (!argc && !from_stdin) {
+               retval = remove_one_note(t, "HEAD", flag);
        } else {
                while (*argv) {
-                       retval |= remove_one_note(t, *argv);
+                       retval |= remove_one_note(t, *argv, flag);
                        argv++;
                }
        }
+       if (from_stdin) {
+               struct strbuf sb = STRBUF_INIT;
+               while (strbuf_getwholeline(&sb, stdin, '\n') != EOF) {
+                       strbuf_rtrim(&sb);
+                       retval |= remove_one_note(t, sb.buf, flag);
+               }
+               strbuf_release(&sb);
+       }
        if (!retval)
                commit_notes(t, "Notes removed by 'git notes remove'");
        free_notes(t);