diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-01-17 15:19:04 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-17 15:19:04 -0800 |
| commit | 13236160c3ce46b84c4605a04a877ef7a407b539 (patch) | |
| tree | 1b44f7f92995e4047155f1643a811d9e75502745 /t | |
| parent | d0366b137c01ada0fc2cd97a151bc36bc4d30eeb (diff) | |
| parent | 9c48b4fb2343070353ee7c6271ff6aedc0462747 (diff) | |
| download | git-13236160c3ce46b84c4605a04a877ef7a407b539.tar.gz git-13236160c3ce46b84c4605a04a877ef7a407b539.tar.xz | |
Merge branch 'ls/t0021-fixup' into maint
* 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 4ea534e9f..34891c4b1 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 |