builtin/notes: fix premature failure when trying to add the empty blob

jherland · gitster · commit 511726e4b191 · 2014-11-10T12:08:20.000-08:00
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 &lt;sunshine@sunshineco.com&gt;
Signed-off-by: Johan Herland &lt;johan@herland.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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);
 	}

Original file line number	Diff line number	Diff line change
`@@ -266,7 +266,7 @@ static int parse_reuse_arg(const struct option opt, const char arg, int unset)`
`266`	`266`
`267`	`267`	`if (get_sha1(arg, object))`
`268`	`268`	`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))) {`
`270`	`270`	`free(buf);`
`271`	`271`	`die(_("Failed to read object '%s'."), arg);`
`272`	`272`	`}`