Skip to content

Commit 511726e

Browse files
jherlandgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Johan Herland <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 66edfe9 commit 511726e

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

builtin/notes.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ static int parse_reuse_arg(const struct option *opt, const char *arg, int unset)
266266

267267
if (get_sha1(arg, object))
268268
die(_("Failed to resolve '%s' as a valid ref."), arg);
269-
if (!(buf = read_sha1_file(object, &type, &len)) || !len) {
269+
if (!(buf = read_sha1_file(object, &type, &len))) {
270270
free(buf);
271271
die(_("Failed to read object '%s'."), arg);
272272
}

0 commit comments

Comments
 (0)