git-notes: fix printing of multi-line notes
The line length was read from the same position every time, causing mangled output when printing notes with multiple lines. Also, adding new-line manually for each line ensures that we get a new-line between commits, matching git-log for commits without notes. Signed-off-by: Tor Arne Vestbø <tavestbo@trolltech.com> Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
bb1dff9def
commit
22a3d06093
@ -59,7 +59,37 @@ EOF
|
||||
test_expect_success 'show notes' '
|
||||
! (git cat-file commit HEAD | grep b1) &&
|
||||
git log -1 > output &&
|
||||
git diff expect output
|
||||
test_cmp expect output
|
||||
'
|
||||
test_expect_success 'create multi-line notes (setup)' '
|
||||
: > a3 &&
|
||||
git add a3 &&
|
||||
test_tick &&
|
||||
git commit -m 3rd &&
|
||||
MSG="b3
|
||||
c3c3c3c3
|
||||
d3d3d3" git notes edit
|
||||
'
|
||||
|
||||
cat > expect-multiline << EOF
|
||||
commit 1584215f1d29c65e99c6c6848626553fdd07fd75
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Thu Apr 7 15:15:13 2005 -0700
|
||||
|
||||
3rd
|
||||
|
||||
Notes:
|
||||
b3
|
||||
c3c3c3c3
|
||||
d3d3d3
|
||||
EOF
|
||||
|
||||
printf "\n" >> expect-multiline
|
||||
cat expect >> expect-multiline
|
||||
|
||||
test_expect_success 'show multi-line notes' '
|
||||
git log -2 > output &&
|
||||
test_cmp expect-multiline output
|
||||
'
|
||||
|
||||
test_done
|
||||
|
Reference in New Issue
Block a user