Add tests for the last two fixes.
This updates t4014 to check the two fixes for git-am and git-commit we observed with "echo" that does backslash interpolation by default without being asked with -e option. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
May 26, 2007 at 00:26 UTC
816366e23dfe366b938b427eac8ea1c8345ea339
1 file changed
+22
-3
t/t4014-format-patch.sh
+22
-3
@@ -16,16 +16,16 @@ test_expect_success setup '
16
17
for i in 1 2 5 6 A B C 7 8 9 10; do echo "$i"; done >file &&
18
git update-index file &&
19
- git commit -m "Side change #1" &&
19
+ git commit -m "Side changes #1" &&
20
21
for i in D E F; do echo "$i"; done >>file &&
22
git update-index file &&
23
- git commit -m "Side change #2" &&
23
+ git commit -m "Side changes #2" &&
24
git tag C2 &&
25
26
for i in 5 6 1 2 3 A 4 B C 7 8 9 10 D E F; do echo "$i"; done >file &&
27
git update-index file &&
28
- git commit -m "Side change #3" &&
28
+ git commit -m "Side changes #3 with \\n backslash-n in it." &&
29
30
git checkout master &&
31
git diff-tree -p C2 | git apply --index &&
@@ -66,4 +66,23 @@ test_expect_success "format-patch --ignore-if-in-upstream result applies" '
66
test $cnt = 2
67
'
68
69
+test_expect_success 'commit did not screw up the log message' '
70
+
71
+ git cat-file commit side | grep "^Side .* with .* backslash-n"
72
+
73
+'
74
+
75
+test_expect_success 'format-patch did not screw up the log message' '
76
+
77
+ grep "^Subject: .*Side changes #3 with .* backslash-n" patch0 &&
78
+ grep "^Subject: .*Side changes #3 with .* backslash-n" patch1
79
+
80
+'
81
+
82
+test_expect_success 'replay did not screw up the log message' '
83
+
84
+ git cat-file commit rebuild-1 | grep "^Side .* with .* backslash-n"
85
+
86
+'
87
+
88
test_done