]> git.ipfire.org Git - thirdparty/git.git/commit - notes.c
notes.c: Use two newlines (instead of one) when concatenating notes
authorJohan Herland <johan@herland.net>
Tue, 9 Nov 2010 21:49:44 +0000 (22:49 +0100)
committerJunio C Hamano <gitster@pobox.com>
Wed, 17 Nov 2010 21:21:29 +0000 (13:21 -0800)
commitd4990c4b2f5f7066853fea4df775b3f506c79431
treeaf48a3a32d0a8450f8ad53528a10f20e4bdfaaa5
parent32a36b4d6f3207f5c01e928085b13af87bf223a1
notes.c: Use two newlines (instead of one) when concatenating notes

When using combine_notes_concatenate() to concatenate notes, it currently
ensures exactly one newline character between the given notes. However,
when using builtin/notes.c:create_note() to concatenate notes (e.g. by
'git notes append'), it adds a newline character to the trailing newline
of the preceding notes object, thus resulting in _two_ newlines (aka. a
blank line) separating contents of the two notes.

This patch brings combine_notes_concatenate() into consistency with
builtin/notes.c:create_note(), by ensuring exactly _two_ newline characters
between concatenated notes.

The patch also changes a few notes-related selftests accordingly.

Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
notes.c
t/t3301-notes.sh
t/t3303-notes-subtrees.sh
t/t3404-rebase-interactive.sh
t/t9301-fast-import-notes.sh