From: Johan Herland <johan@herland.net>
To: gitster@pobox.com
Cc: git@vger.kernel.org, mackyle@gmail.com, jhf@trifork.com,
Eric Sunshine <sunshine@sunshineco.com>,
Johan Herland <johan@herland.net>
Subject: [PATCHv3 1/5] builtin/notes: Fix premature failure when trying to add the empty blob
Date: Fri, 7 Nov 2014 10:19:17 +0100 [thread overview]
Message-ID: <1415351961-31567-2-git-send-email-johan@herland.net> (raw)
In-Reply-To: <1415351961-31567-1-git-send-email-johan@herland.net>
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>
---
builtin/notes.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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);
}
--
2.0.0.rc4.501.gdaf83ca
next prev parent reply other threads:[~2014-11-07 9:20 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-07 9:19 [PATCHv3 0/5] Handling empty notes Johan Herland
2014-11-07 9:19 ` Johan Herland [this message]
2014-11-07 9:19 ` [PATCHv3 2/5] t3301: Verify that 'git notes' removes empty notes by default Johan Herland
2014-11-07 17:48 ` Junio C Hamano
2014-11-07 9:19 ` [PATCHv3 3/5] builtin/notes: Add --allow-empty, to allow storing empty notes Johan Herland
2014-11-07 18:04 ` Junio C Hamano
2014-11-09 12:31 ` Johan Herland
2014-11-10 20:18 ` Junio C Hamano
2014-11-07 9:19 ` [PATCHv3 4/5] notes: Empty notes should be shown by 'git log' Johan Herland
2014-11-07 18:51 ` Junio C Hamano
2014-11-07 9:19 ` [PATCHv3 5/5] t3301: Use write_script(), nitpick whitespace Johan Herland
2014-11-07 18:55 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1415351961-31567-2-git-send-email-johan@herland.net \
--to=johan@herland.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jhf@trifork.com \
--cc=mackyle@gmail.com \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).