aboutsummaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-09-08 09:17:01 -0700
committerJunio C Hamano <gitster@pobox.com>2010-09-08 09:17:01 -0700
commit1d86cb80ceee1e93eacded1555abd7f113857efd (patch)
tree24d2dc19078993d54ec0b00906a005a34337dcca /builtin
parentb815a726e9da97924b44d551b10d3fef3b3d1885 (diff)
parent1ee1e43df37e53b0bc50a0eda57dd1772dc220f5 (diff)
downloadgit-1d86cb80ceee1e93eacded1555abd7f113857efd.tar.gz
git-1d86cb80ceee1e93eacded1555abd7f113857efd.tar.xz
Merge branch 'jh/error-removing-missing-note'
* jh/error-removing-missing-note: notes: Don't create (empty) commit when removing non-existing notes
Diffstat (limited to 'builtin')
-rw-r--r--builtin/notes.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/builtin/notes.c b/builtin/notes.c
index fbc347c9f..6d07aac80 100644
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@ -769,6 +769,7 @@ static int remove_cmd(int argc, const char **argv, const char *prefix)
const char *object_ref;
struct notes_tree *t;
unsigned char object[20];
+ int retval;
argc = parse_options(argc, argv, prefix, options,
git_notes_remove_usage, 0);
@@ -785,12 +786,17 @@ static int remove_cmd(int argc, const char **argv, const char *prefix)
t = init_notes_check("remove");
- fprintf(stderr, "Removing note for object %s\n", sha1_to_hex(object));
- remove_note(t, object);
+ 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'");
+ commit_notes(t, "Notes removed by 'git notes remove'");
+ }
free_notes(t);
- return 0;
+ return retval;
}
static int prune(int argc, const char **argv, const char *prefix)