The tests adds a third commit with a multi-line note. The output of git log -2 is then checked to see if the note lines are wrapped correctly, and that there's a line separator between the two commits. Also, changed from using 'git diff' to test expect vs. output to use 'test_cmp', as I had problems getting correct results using the former. Signed-off-by: Tor Arne Vestbø <tavestbo@xxxxxxxxxxxxx> --- t/t3301-notes.sh | 35 ++++++++++++++++++++++++++++++++--- 1 files changed, 32 insertions(+), 3 deletions(-) diff --git a/t/t3301-notes.sh b/t/t3301-notes.sh index ba42c45..76bb6dd 100755 --- a/t/t3301-notes.sh +++ b/t/t3301-notes.sh @@ -8,8 +8,8 @@ test_description='Test commit notes' . ./test-lib.sh cat > fake_editor.sh << \EOF -echo "$MSG" > "$1" -echo "$MSG" >& 2 +echo -e "$MSG" > "$1" +echo -e "$MSG" >& 2 EOF chmod a+x fake_editor.sh VISUAL=./fake_editor.sh @@ -59,7 +59,36 @@ 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\nc3c3c3c3\nd3d3d3" git notes edit + +' + +cat > expect-multiline << EOF +commit 1584215f1d29c65e99c6c6848626553fdd07fd75 +Author: A U Thor <author@xxxxxxxxxxx> +Date: Thu Apr 7 15:15:13 2005 -0700 + + 3rd + +Notes: + b3 + c3c3c3c3 + d3d3d3 +EOF + +echo >> expect-multiline +cat expect >> expect-multiline + +test_expect_success 'show multi-line notes' ' + git log -2 > output && + test_cmp expect-multiline output ' test_done -- 1.6.0.2.GIT -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
