summaryrefslogtreecommitdiff
path: root/t/t6025-merge-symlinks.sh
diff options
context:
space:
mode:
authorLibravatar Johan Herland <johan@herland.net>2010-11-09 22:49:44 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-11-17 13:21:29 -0800
commitd4990c4b2f5f7066853fea4df775b3f506c79431 (patch)
treeaf48a3a32d0a8450f8ad53528a10f20e4bdfaaa5 /t/t6025-merge-symlinks.sh
parent(trivial) t3303: Indent with tabs instead of spaces for consistency (diff)
downloadtgif-d4990c4b2f5f7066853fea4df775b3f506c79431.tar.xz
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>
Diffstat (limited to 't/t6025-merge-symlinks.sh')
0 files changed, 0 insertions, 0 deletions