diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-12-21 14:30:52 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-21 14:30:52 -0800 |
| commit | 6ae7a51a2e8efdb10c18d59693e647a73d98d9d3 (patch) | |
| tree | 80c68993f0b56ce5b0046449e6c261e6738a5890 /t | |
| parent | 3f246b1cef2c568bbac1f71c25fbf8045ff6448a (diff) | |
| parent | 9ec09b0495f5e672223025f5e681371034da2538 (diff) | |
| download | git-6ae7a51a2e8efdb10c18d59693e647a73d98d9d3.tar.gz git-6ae7a51a2e8efdb10c18d59693e647a73d98d9d3.tar.xz | |
Merge branch 'ks/blame-worktree-textconv-cached'
* ks/blame-worktree-textconv-cached:
fill_textconv(): Don't get/put cache if sha1 is not valid
t/t8006: Demonstrate blame is broken when cachetextconv is on
Diffstat (limited to 't')
| -rwxr-xr-x | t/t8006-blame-textconv.sh | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/t/t8006-blame-textconv.sh b/t/t8006-blame-textconv.sh index dbf623bce..ea64cd8d0 100755 --- a/t/t8006-blame-textconv.sh +++ b/t/t8006-blame-textconv.sh @@ -73,6 +73,27 @@ test_expect_success 'blame --textconv going through revisions' ' test_cmp expected result ' +test_expect_success 'setup +cachetextconv' ' + git config diff.test.cachetextconv true +' + +cat >expected_one <<EOF +(Number2 2010-01-01 20:00:00 +0000 1) converted: test 1 version 2 +EOF + +test_expect_success 'blame --textconv works with textconvcache' ' + git blame --textconv two.bin >blame && + find_blame <blame >result && + test_cmp expected result && + git blame --textconv one.bin >blame && + find_blame <blame >result && + test_cmp expected_one result +' + +test_expect_success 'setup -cachetextconv' ' + git config diff.test.cachetextconv false +' + test_expect_success 'make a new commit' ' echo "bin: test number 2 version 3" >>two.bin && GIT_AUTHOR_NAME=Number3 git commit -a -m Third --date="2010-01-01 22:00:00" |