Skip to content

Commit

Permalink
notes: empty notes should be shown by 'git log'
Browse files Browse the repository at this point in the history
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Johan Herland authored and Junio C Hamano committed Nov 12, 2014
1 parent d73a5b9 commit 8a4acd6
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 2 deletions.
3 changes: 1 addition & 2 deletions notes.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
12 changes: 12 additions & 0 deletions t/t3301-notes.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 8a4acd6

Please sign in to comment.