diff options
| author |  Ben Walton <bwalton@artsci.utoronto.ca> | 2012-01-09 21:47:33 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2012-01-09 20:43:48 -0800 |
| commit | 8b9624c3741f3449510285fec21106bfee5d4942 (patch) | |
| tree | d1c54e078caa75b02813999b996b948655979505 | |
| parent | Git 1.7.8.2 (diff) | |
| download | tgif-8b9624c3741f3449510285fec21106bfee5d4942.tar.xz | |
Use perl instead of sed for t8006-blame-textconv test
In test 'blame --textconv with local changes' of t8006-blame-textconv,
using /usr/xpg4/bin/sed (as set by SANE_TOOL_PATH), an additional
newline was added to the output from the 'helper' script.
This was noted by sed with a message such as:
sed: Missing newline at end of file zero.bin.
Sed then exits with status 2 causing the helper script to also exit
with status 2.
In turn, this was triggering a fatal error from git blame:
fatal: unable to read files to diff
To work around this difference in sed behaviour, use perl -p instead
of sed -e as it exits cleanly and does not insert the additional
newline.
Signed-off-by: Ben Walton <bwalton@artsci.utoronto.ca>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t8006-blame-textconv.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t8006-blame-textconv.sh b/t/t8006-blame-textconv.sh index 4ee42f12f0..c3c22f7764 100755 --- a/t/t8006-blame-textconv.sh +++ b/t/t8006-blame-textconv.sh @@ -10,7 +10,7 @@ find_blame() { cat >helper <<'EOF' #!/bin/sh grep -q '^bin: ' "$1" || { echo "E: $1 is not \"binary\" file" 1>&2; exit 1; } -sed 's/^bin: /converted: /' "$1" +perl -p -e 's/^bin: /converted: /' "$1" EOF chmod +x helper |