author | Ben Walton <bwalton@artsci.utoronto.ca> | |
Tue, 10 Jan 2012 02:47:33 +0000 (21:47 -0500) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Tue, 10 Jan 2012 04:43:48 +0000 (20:43 -0800) | ||
commit | 8b9624c3741f3449510285fec21106bfee5d4942 | |
tree | d1c54e078caa75b02813999b996b948655979505 | tree | snapshot |
parent | f3f778df6900881a7bac409c927931c32b82bcb5 | commit | diff |
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>
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>
t/t8006-blame-textconv.sh | diff | blob | history |