diff options
| author | Johan Herland <johan@herland.net> | 2010-11-09 22:49:44 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-17 13:21:29 -0800 |
| commit | d4990c4b2f5f7066853fea4df775b3f506c79431 (patch) | |
| tree | af48a3a32d0a8450f8ad53528a10f20e4bdfaaa5 /t/t9301-fast-import-notes.sh | |
| parent | 32a36b4d6f3207f5c01e928085b13af87bf223a1 (diff) | |
| download | git-d4990c4b2f5f7066853fea4df775b3f506c79431.tar.gz git-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/t9301-fast-import-notes.sh')
| -rwxr-xr-x | t/t9301-fast-import-notes.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/t/t9301-fast-import-notes.sh b/t/t9301-fast-import-notes.sh index a5c99d850..7cf8cd8a2 100755 --- a/t/t9301-fast-import-notes.sh +++ b/t/t9301-fast-import-notes.sh @@ -255,13 +255,18 @@ EOF INPUT_END +whitespace=" " + cat >expect <<EXPECT_END fourth commit pre-prefix of note for fourth commit +$whitespace prefix of note for fourth commit +$whitespace third note for fourth commit third commit prefix of note for third commit +$whitespace third note for third commit second commit third note for second commit |