From dc42704e0bfc86036d0f259b139aa9ec702d787a Mon Sep 17 00:00:00 2001 From: Taylor Blau Date: Wed, 13 Jul 2016 09:09:27 -0600 Subject: [PATCH] test/zero-len: update test for git v2.9.1 With the new release of Git, version 2.9.1, our "pull zero len file" test is broken. @larsxschneider was the first to point this out in github/git-lfs#1363. The cause of this problem is that `git-status` changed to print "working tree clean", instead of "working directory clean" when running in a clean working tree. Though this is more correct, it still broke our tests :-). This commit changes the `grep` assertion to match the new behavior of `git-status`. The relevant change from git/git is here: git/git@2a0e6cd. Closes: github/git-lfs#1363. --- test/test-zero-len-file.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/test-zero-len-file.sh b/test/test-zero-len-file.sh index dbbbd1d7..bc466fb9 100755 --- a/test/test-zero-len-file.sh +++ b/test/test-zero-len-file.sh @@ -50,7 +50,8 @@ begin_test "pull zero len file" clone_repo "$reponame" clone rm clone.log - git status | grep "working directory clean" + git status 2>&1 | tee status.log + grep "working (directory|tree) clean" status.log ls -al if [ -s "empty.dat" ]; then