mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
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>
This commit is contained in:
parent
f3f778df69
commit
8b9624c374
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in a new issue