Hi Lars, For the last two days, I've noticed t0021.15 on the 'pu' branch has been failing intermittently (well it fails with: 'make test >ptest-out', but when run by hand, it fails only say 1-in-6, 1-in-18, etc.). [yes, it's a bit strange; this hasn't changed in a couple of weeks!] I don't have time to investigate further tonight and, since I had not heard anyone else complain, I thought I should let you know. See below for the output from a failing run. [Note: this is on Linux Mint 18, tonight's pu branch @7c7984401]. ATB, Ramsay Jones $ ./t0021-conversion.sh -i -v ... ok 14 - diff does not reuse worktree files that need cleaning expecting success: test_config_global filter.protocol.process "rot13-filter.pl clean smudge" && test_config_global filter.protocol.required true && rm -rf repo && mkdir repo && ( cd repo && git init && echo "*.r filter=protocol" >.gitattributes && git add . && git commit -m "test commit 1" && git branch empty-branch && cp "$TEST_ROOT/test.o" test.r && cp "$TEST_ROOT/test2.o" test2.r && mkdir testsubdir && cp "$TEST_ROOT/test3 'sq',\$x=.o" "testsubdir/test3 'sq',\$x=.r" && >test4-empty.r && S=$(file_size test.r) && S2=$(file_size test2.r) && S3=$(file_size "testsubdir/test3 'sq',\$x=.r") && filter_git add . && cat >expected.log <<-EOF && START init handshake complete IN: clean test.r $S [OK] -- OUT: $S . [OK] IN: clean test2.r $S2 [OK] -- OUT: $S2 . [OK] IN: clean test4-empty.r 0 [OK] -- OUT: 0 [OK] IN: clean testsubdir/test3 'sq',\$x=.r $S3 [OK] -- OUT: $S3 . [OK] STOP EOF test_cmp_count expected.log rot13-filter.log && filter_git commit -m "test commit 2" && cat >expected.log <<-EOF && START init handshake complete IN: clean test.r $S [OK] -- OUT: $S . [OK] IN: clean test2.r $S2 [OK] -- OUT: $S2 . [OK] IN: clean test4-empty.r 0 [OK] -- OUT: 0 [OK] IN: clean testsubdir/test3 'sq',\$x=.r $S3 [OK] -- OUT: $S3 . [OK] IN: clean test.r $S [OK] -- OUT: $S . [OK] IN: clean test2.r $S2 [OK] -- OUT: $S2 . [OK] IN: clean test4-empty.r 0 [OK] -- OUT: 0 [OK] IN: clean testsubdir/test3 'sq',\$x=.r $S3 [OK] -- OUT: $S3 . [OK] STOP EOF test_cmp_count expected.log rot13-filter.log && rm -f test2.r "testsubdir/test3 'sq',\$x=.r" && filter_git checkout --quiet --no-progress . && cat >expected.log <<-EOF && START init handshake complete IN: smudge test2.r $S2 [OK] -- OUT: $S2 . [OK] IN: smudge testsubdir/test3 'sq',\$x=.r $S3 [OK] -- OUT: $S3 . [OK] STOP EOF test_cmp_exclude_clean expected.log rot13-filter.log && filter_git checkout --quiet --no-progress empty-branch && cat >expected.log <<-EOF && START init handshake complete IN: clean test.r $S [OK] -- OUT: $S . [OK] STOP EOF test_cmp_exclude_clean expected.log rot13-filter.log && filter_git checkout --quiet --no-progress master && cat >expected.log <<-EOF && START init handshake complete IN: smudge test.r $S [OK] -- OUT: $S . [OK] IN: smudge test2.r $S2 [OK] -- OUT: $S2 . [OK] IN: smudge test4-empty.r 0 [OK] -- OUT: 0 [OK] IN: smudge testsubdir/test3 'sq',\$x=.r $S3 [OK] -- OUT: $S3 . [OK] STOP EOF test_cmp_exclude_clean expected.log rot13-filter.log && test_cmp_committed_rot13 "$TEST_ROOT/test.o" test.r && test_cmp_committed_rot13 "$TEST_ROOT/test2.o" test2.r && test_cmp_committed_rot13 "$TEST_ROOT/test3 'sq',\$x=.o" "testsubdir/test3 'sq',\$x=.r" ) Initialized empty Git repository in /home/ramsay/git/t/trash directory.t0021-conversion/repo/.git/ [master (root-commit) 56d459b] test commit 1 Author: A U Thor <author@xxxxxxxxxxx> 1 file changed, 1 insertion(+) create mode 100644 .gitattributes [master 9ea74df] test commit 2 Author: A U Thor <author@xxxxxxxxxxx> 4 files changed, 5 insertions(+) create mode 100644 test.r create mode 100644 test2.r create mode 100644 test4-empty.r create mode 100644 testsubdir/test3 'sq',$x=.r sort: cannot read: rot13-filter.log: No such file or directory --- expected.log 2016-12-16 20:14:29.037426091 +0000 +++ rot13-filter.log 2016-12-16 20:14:29.041426091 +0000 @@ -1,7 +0,0 @@ -x IN: clean test.r 57 [OK] -- OUT: 57 . [OK] -x IN: clean test2.r 14 [OK] -- OUT: 14 . [OK] -x IN: clean test4-empty.r 0 [OK] -- OUT: 0 [OK] -x IN: clean testsubdir/test3 'sq',$x=.r 49 [OK] -- OUT: 49 . [OK] - 1 START - 1 STOP - 1 init handshake complete not ok 15 - required process filter should filter data # # test_config_global filter.protocol.process "rot13-filter.pl clean smudge" && # test_config_global filter.protocol.required true && # rm -rf repo && # mkdir repo && # ( # cd repo && # git init && # # echo "*.r filter=protocol" >.gitattributes && # git add . && # git commit -m "test commit 1" && # git branch empty-branch && # # cp "$TEST_ROOT/test.o" test.r && # cp "$TEST_ROOT/test2.o" test2.r && # mkdir testsubdir && # cp "$TEST_ROOT/test3 'sq',\$x=.o" "testsubdir/test3 'sq',\$x=.r" && # >test4-empty.r && # # S=$(file_size test.r) && # S2=$(file_size test2.r) && # S3=$(file_size "testsubdir/test3 'sq',\$x=.r") && # # filter_git add . && # cat >expected.log <<-EOF && # START # init handshake complete # IN: clean test.r $S [OK] -- OUT: $S . [OK] # IN: clean test2.r $S2 [OK] -- OUT: $S2 . [OK] # IN: clean test4-empty.r 0 [OK] -- OUT: 0 [OK] # IN: clean testsubdir/test3 'sq',\$x=.r $S3 [OK] -- OUT: $S3 . [OK] # STOP # EOF # test_cmp_count expected.log rot13-filter.log && # # filter_git commit -m "test commit 2" && # cat >expected.log <<-EOF && # START # init handshake complete # IN: clean test.r $S [OK] -- OUT: $S . [OK] # IN: clean test2.r $S2 [OK] -- OUT: $S2 . [OK] # IN: clean test4-empty.r 0 [OK] -- OUT: 0 [OK] # IN: clean testsubdir/test3 'sq',\$x=.r $S3 [OK] -- OUT: $S3 . [OK] # IN: clean test.r $S [OK] -- OUT: $S . [OK] # IN: clean test2.r $S2 [OK] -- OUT: $S2 . [OK] # IN: clean test4-empty.r 0 [OK] -- OUT: 0 [OK] # IN: clean testsubdir/test3 'sq',\$x=.r $S3 [OK] -- OUT: $S3 . [OK] # STOP # EOF # test_cmp_count expected.log rot13-filter.log && # # rm -f test2.r "testsubdir/test3 'sq',\$x=.r" && # # filter_git checkout --quiet --no-progress . && # cat >expected.log <<-EOF && # START # init handshake complete # IN: smudge test2.r $S2 [OK] -- OUT: $S2 . [OK] # IN: smudge testsubdir/test3 'sq',\$x=.r $S3 [OK] -- OUT: $S3 . [OK] # STOP # EOF # test_cmp_exclude_clean expected.log rot13-filter.log && # # filter_git checkout --quiet --no-progress empty-branch && # cat >expected.log <<-EOF && # START # init handshake complete # IN: clean test.r $S [OK] -- OUT: $S . [OK] # STOP # EOF # test_cmp_exclude_clean expected.log rot13-filter.log && # # filter_git checkout --quiet --no-progress master && # cat >expected.log <<-EOF && # START # init handshake complete # IN: smudge test.r $S [OK] -- OUT: $S . [OK] # IN: smudge test2.r $S2 [OK] -- OUT: $S2 . [OK] # IN: smudge test4-empty.r 0 [OK] -- OUT: 0 [OK] # IN: smudge testsubdir/test3 'sq',\$x=.r $S3 [OK] -- OUT: $S3 . [OK] # STOP # EOF # test_cmp_exclude_clean expected.log rot13-filter.log && # # test_cmp_committed_rot13 "$TEST_ROOT/test.o" test.r && # test_cmp_committed_rot13 "$TEST_ROOT/test2.o" test2.r && # test_cmp_committed_rot13 "$TEST_ROOT/test3 'sq',\$x=.o" "testsubdir/test3 'sq',\$x=.r" # ) # $