summaryrefslogtreecommitdiff
path: root/builtin/notes.c
diff options
context:
space:
mode:
authorJohan Herland <johan@herland.net>2014-11-09 12:30:47 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-11-10 20:08:20 (GMT)
commit511726e4b191ad76e7b4875d8f2361b05d5cfb39 (patch)
treebd5f47f1d070d272af10814edc1813e59fcc5a52 /builtin/notes.c
parent66edfe9ddc29102fa39edd37f9aecccbaca6a013 (diff)
downloadgit-511726e4b191ad76e7b4875d8f2361b05d5cfb39.zip
git-511726e4b191ad76e7b4875d8f2361b05d5cfb39.tar.gz
git-511726e4b191ad76e7b4875d8f2361b05d5cfb39.tar.bz2
builtin/notes: fix premature failure when trying to add the empty blob
This fixes a small buglet when trying to explicitly add the empty blob as a note object using the -c or -C option to git notes add/append. Instead of failing with a nonsensical error message indicating that the empty blob does not exist, we should rather behave as if an empty notes message was given (e.g. using -m "" or -F /dev/null). The next patch contains a test that verifies the fixed behavior. Found-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/notes.c')
-rw-r--r--builtin/notes.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/notes.c b/builtin/notes.c
index 68b6cd8..9ee6816 100644
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@ -266,7 +266,7 @@ static int parse_reuse_arg(const struct option *opt, const char *arg, int unset)
if (get_sha1(arg, object))
die(_("Failed to resolve '%s' as a valid ref."), arg);
- if (!(buf = read_sha1_file(object, &type, &len)) || !len) {
+ if (!(buf = read_sha1_file(object, &type, &len))) {
free(buf);
die(_("Failed to read object '%s'."), arg);
}