diff options
| -rw-r--r-- | diff.c | 4 | ||||
| -rwxr-xr-x | t/t8006-blame-textconv.sh | 3 |
2 files changed, 3 insertions, 4 deletions
@@ -4388,7 +4388,7 @@ size_t fill_textconv(struct userdiff_driver *driver, return df->size; } - if (driver->textconv_cache) { + if (driver->textconv_cache && df->sha1_valid) { *outbuf = notes_cache_get(driver->textconv_cache, df->sha1, &size); if (*outbuf) @@ -4399,7 +4399,7 @@ size_t fill_textconv(struct userdiff_driver *driver, if (!*outbuf) die("unable to read files to diff"); - if (driver->textconv_cache) { + if (driver->textconv_cache && df->sha1_valid) { /* ignore errors, as we might be in a readonly repository */ notes_cache_put(driver->textconv_cache, df->sha1, *outbuf, size); diff --git a/t/t8006-blame-textconv.sh b/t/t8006-blame-textconv.sh index fe90541842..ea64cd8d0f 100755 --- a/t/t8006-blame-textconv.sh +++ b/t/t8006-blame-textconv.sh @@ -81,8 +81,7 @@ cat >expected_one <<EOF (Number2 2010-01-01 20:00:00 +0000 1) converted: test 1 version 2 EOF -# one.bin is blamed as 'Not Committed yet' -test_expect_failure 'blame --textconv works with textconvcache' ' +test_expect_success 'blame --textconv works with textconvcache' ' git blame --textconv two.bin >blame && find_blame <blame >result && test_cmp expected result && |