diff options
Diffstat (limited to 't/t0021-conversion.sh')
| -rwxr-xr-x | t/t0021-conversion.sh | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/t/t0021-conversion.sh b/t/t0021-conversion.sh index 42b28aa9f9..64b2b8f8e6 100755 --- a/t/t0021-conversion.sh +++ b/t/t0021-conversion.sh @@ -334,10 +334,24 @@ test_expect_success 'recovery from failure of smudgeToFile filter that deletes t test_cmp test fstest.t ' +test_expect_success 'smudgeToFile filter is used in merge' ' + test_config filter.rot13.smudgeToFile ./rot13-to-file.sh && + + git commit -m "added fstest.t" fstest.t && + git checkout -b old && + git reset --hard HEAD^ && + git merge master && + git checkout master && + + test -e rot13-to-file.ran && + rm -f rot13-to-file.ran && + + test_cmp test fstest.t +' + test_expect_success 'smudgeToFile filter is used by git am' ' test_config filter.rot13.smudgeToFile ./rot13-to-file.sh && - git commit fstest.t -m "added fstest.t" && git format-patch HEAD^ --stdout >fstest.patch && git reset --hard HEAD^ && git am fstest.patch && |