Change sed i\ usage to something Solaris' sed can handle
Solaris' sed was choking on the i\ commands used in t4015-diff-whitespace as it couldn't parse the program properly. Modify two uses of sed that worked in GNU sed but not Solaris' (/usr/bin or /usr/xpg4/bin) to an equivalent form that is handled properly by both. Signed-off-by: Ben Walton <bdwalton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ben Walton committed
Oct 27, 2013 at 21:26 UTC
90a95301d32bb2f45e37ed08d3a1d1b632706f03
1 file changed
+4
-2
t/t4015-diff-whitespace.sh
+4
-2
@@ -145,7 +145,8 @@ test_expect_success 'another test, with --ignore-space-at-eol' 'test_cmp expect
145
test_expect_success 'ignore-blank-lines: only new lines' '
146
test_seq 5 >x &&
147
git update-index x &&
148
- test_seq 5 | sed "/3/i \\
148
+ test_seq 5 | sed "/3/i\\
149
+\
150
" >x &&
151
git diff --ignore-blank-lines >out &&
152
>expect &&
@@ -155,7 +156,8 @@ test_expect_success 'ignore-blank-lines: only new lines' '
156
test_expect_success 'ignore-blank-lines: only new lines with space' '
157
test_seq 5 >x &&
158
git update-index x &&
158
- test_seq 5 | sed "/3/i \ " >x &&
159
+ test_seq 5 | sed "/3/i\\
160
+ " >x &&
161
git diff -w --ignore-blank-lines >out &&
162
>expect &&
163
test_cmp out expect