diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-10-02 11:50:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-10-02 12:05:38 -0700 |
| commit | 50fb51e7e81748182a770d3943ec5730357b27e7 (patch) | |
| tree | 0f0022601d16cd5f27a6b2656b580432f05ae904 | |
| parent | diff: diff.context configuration gives default to -U (diff) | |
| download | tgif-50fb51e7e81748182a770d3943ec5730357b27e7.tar.xz | |
t4055: avoid use of sed 'a' command
The 'a', 'i' and 'c' commands take a literal text to be added
followed by backslash, but then in the source we cannot indent
the literal text which makes it ugly.
We need to also remember to double the backslash inside double
quotes.
Avoid these issues altogether by having an extra line in a template
file and generate test vectors by deleting the line or replacing the
line and not using the 'a' command.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t4055-diff-context.sh | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/t/t4055-diff-context.sh b/t/t4055-diff-context.sh index 35276868ea..97172b46b2 100755 --- a/t/t4055-diff-context.sh +++ b/t/t4055-diff-context.sh @@ -8,7 +8,7 @@ test_description='diff.context configuration' . ./test-lib.sh test_expect_success 'setup' ' - cat >x <<-\EOF && + cat >template <<-\EOF && firstline b c @@ -16,6 +16,7 @@ test_expect_success 'setup' ' e f preline + TARGET postline i j @@ -24,17 +25,15 @@ test_expect_success 'setup' ' m n EOF + sed "/TARGET/d" >x <template && git update-index --add x && git commit -m initial && - git cat-file blob HEAD:x | - sed "/preline/a\ - ADDED" >x && + sed "s/TARGET/ADDED/" >x <template && git update-index --add x && git commit -m next && - git cat-file blob HEAD:x | - sed s/ADDED/MODIFIED/ >x + sed "s/TARGET/MODIFIED/" >x <template ' test_expect_success 'the default number of context lines is 3' ' |