diff options
| author | Ben Walton <bdwalton@gmail.com> | 2013-10-27 21:26:48 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-10-28 09:27:06 -0700 |
| commit | 90a95301d32bb2f45e37ed08d3a1d1b632706f03 (patch) | |
| tree | 42e8e3b975953645c895404da4340c111a73aab0 | |
| parent | 3d092bfc6f2d9a998967979f926c661e9762601c (diff) | |
| download | git-90a95301d32bb2f45e37ed08d3a1d1b632706f03.tar.gz | |
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>
| -rwxr-xr-x | t/t4015-diff-whitespace.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/t/t4015-diff-whitespace.sh b/t/t4015-diff-whitespace.sh index 3fb4b976a2..0126154e08 100755 --- a/t/t4015-diff-whitespace.sh +++ b/t/t4015-diff-whitespace.sh @@ -145,7 +145,8 @@ test_expect_success 'another test, with --ignore-space-at-eol' 'test_cmp expect test_expect_success 'ignore-blank-lines: only new lines' ' test_seq 5 >x && git update-index x && - test_seq 5 | sed "/3/i \\ + test_seq 5 | sed "/3/i\\ +\ " >x && git diff --ignore-blank-lines >out && >expect && @@ -155,7 +156,8 @@ test_expect_success 'ignore-blank-lines: only new lines' ' test_expect_success 'ignore-blank-lines: only new lines with space' ' test_seq 5 >x && git update-index x && - test_seq 5 | sed "/3/i \ " >x && + test_seq 5 | sed "/3/i\\ + " >x && git diff -w --ignore-blank-lines >out && >expect && test_cmp out expect |