From: Junio C Hamano <gitster@pobox•com>
To: Johan Herland <johan@herland•net>
Cc: git@vger•kernel.org, mackyle@gmail•com, jhf@trifork•com,
Eric Sunshine <sunshine@sunshineco•com>
Subject: Re: [PATCHv3 4/5] notes: Empty notes should be shown by 'git log'
Date: Fri, 07 Nov 2014 10:51:19 -0800 [thread overview]
Message-ID: <xmqqr3xeg7yw.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1415351961-31567-5-git-send-email-johan@herland.net> (Johan Herland's message of "Fri, 7 Nov 2014 10:19:20 +0100")
Johan Herland <johan@herland•net> writes:
> If the user has gone through the trouble of explicitly adding an empty
> note, then "git log" should not silently skip it (as if it didn't exist).
>
> Signed-off-by: Johan Herland <johan@herland•net>
> ---
This makes sense and is in line with the theme of this series.
> notes.c | 3 +--
> t/t3301-notes.sh | 12 ++++++++++++
> 2 files changed, 13 insertions(+), 2 deletions(-)
>
> diff --git a/notes.c b/notes.c
> index 5fe691d..62bc6e1 100644
> --- a/notes.c
> +++ b/notes.c
> @@ -1218,8 +1218,7 @@ static void format_note(struct notes_tree *t, const unsigned char *object_sha1,
> if (!sha1)
> return;
>
> - if (!(msg = read_sha1_file(sha1, &type, &msglen)) || !msglen ||
> - type != OBJ_BLOB) {
> + if (!(msg = read_sha1_file(sha1, &type, &msglen)) || type != OBJ_BLOB) {
> free(msg);
> return;
> }
> diff --git a/t/t3301-notes.sh b/t/t3301-notes.sh
> index 8280a1a..f5d8193 100755
> --- a/t/t3301-notes.sh
> +++ b/t/t3301-notes.sh
> @@ -1274,4 +1274,16 @@ append -C "$empty_blob"
> edit
> EOF
>
> +test_expect_success 'empty notes are displayed by git log' '
> + test_commit 17th &&
> + git log -1 >expect &&
> + cat >>expect <<\EOF &&
> +
> +Notes:
> +EOF
> + git notes add -C "$empty_blob" --allow-empty &&
> + git log -1 >actual &&
> + test_cmp expect actual
> +'
> +
> test_done
next prev parent reply other threads:[~2014-11-07 18:53 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 ` [PATCHv3 1/5] builtin/notes: Fix premature failure when trying to add the empty blob Johan Herland
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 [this message]
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=xmqqr3xeg7yw.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=jhf@trifork$(echo .)com \
--cc=johan@herland$(echo .)net \
--cc=mackyle@gmail$(echo .)com \
--cc=sunshine@sunshineco$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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