[PATCH v6 01/10] t0027: Make more reliable
- From
tboegi@web.de <tboegi@web.de>
- Date
- Apr 22, 2016, 14:38 UTC
- Message-ID
- <1461335908-5013-1-git-send-email-tboegi@web.de>
- In-Reply-To
- <xmqqegblor2l.fsf@gitster.mtv.corp.google.com>
From: Torsten Bögershausen <tboegi@web.de>
Make the commit_chk_wrnNNO test in t0027 more reliable: When the attributes of a commited file are changed and the file is otherwise unchanged, Git may not detect that the next commit may need to treat the file as changed. This happens when lstat() doesn't detect a change, since neither inode, mtime nor size are changed.
Add a singe "Z" character to change the file size. Ignore it when comparing the files later.
Signed-off-by: Torsten Bögershausen <tboegi@web.de> --- Changes since v5: - send the whole series, now 10/10 - Removed the "will change in future" in one commit msg - Don't leak the filer in 4/10 t/t0027-auto-crlf.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/t/t0027-auto-crlf.sh b/t/t0027-auto-crlf.sh index f33962b..9fe539b 100755 --- a/t/t0027-auto-crlf.sh +++ b/t/t0027-auto-crlf.sh @@ -12,7 +12,7 @@ fi compare_files () { tr '\015\000' QN <"$1" >"$1".expect && - tr '\015\000' QN <"$2" >"$2".actual && + tr '\015\000' QN <"$2" | tr -d 'Z' >"$2".actual && test_cmp "$1".expect "$2".actual && rm "$1".expect "$2".actual } @@ -114,6 +114,7 @@ commit_chk_wrnNNO () { do fname=${pfx}_$f.txt && cp $f $fname && + printf Z >>"$fname" && git -c core.autocrlf=$crlf add $fname 2>/dev/null && git -c core.autocrlf=$crlf commit -m "commit_$fname" $fname >"${pfx}_$f.err" 2>&1 done
-- 2.8.0.rc2.2.g1a4d45a.dirty