diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-12-19 14:45:30 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-12-19 14:45:30 -0800 |
commit | 63d6a9c962e0f69e504d5d63be3566c77500e6d1 (patch) | |
tree | b31560a8c7f4db2778c715a34d33a654d394195e /t | |
parent | Merge branch 'ah/grammos' (diff) | |
parent | t0021: minor filter process test cleanup (diff) | |
download | tgif-63d6a9c962e0f69e504d5d63be3566c77500e6d1.tar.xz |
Merge branch 'ls/t0021-fixup'
* ls/t0021-fixup:
t0021: minor filter process test cleanup
Diffstat (limited to 't')
-rwxr-xr-x | t/t0021-conversion.sh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/t/t0021-conversion.sh b/t/t0021-conversion.sh index 4ea534e9fa..34891c4b1a 100755 --- a/t/t0021-conversion.sh +++ b/t/t0021-conversion.sh @@ -350,10 +350,9 @@ test_expect_success PERL 'required process filter should filter data' ' cd repo && git init && - echo "git-stderr.log" >.gitignore && echo "*.r filter=protocol" >.gitattributes && git add . && - git commit . -m "test commit 1" && + git commit -m "test commit 1" && git branch empty-branch && cp "$TEST_ROOT/test.o" test.r && @@ -378,7 +377,7 @@ test_expect_success PERL 'required process filter should filter data' ' EOF test_cmp_count expected.log rot13-filter.log && - filter_git commit . -m "test commit 2" && + filter_git commit -m "test commit 2" && cat >expected.log <<-EOF && START init handshake complete |