summaryrefslogtreecommitdiff
path: root/diffcore-order.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-08-03 15:10:29 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-08-03 15:10:29 -0700
commit767da54bf8bd212a483097999ee9ba77b711e4a8 (patch)
tree85dbfebd28cf3134a9bd5515d240c66d506fdd90 /diffcore-order.c
parentMerge branch 'rs/submodule-config-code-cleanup' (diff)
parentdiff: do not reuse worktree files that need "clean" conversion (diff)
downloadtgif-767da54bf8bd212a483097999ee9ba77b711e4a8.tar.xz
Merge branch 'jk/diff-do-not-reuse-wtf-needs-cleaning'
There is an optimization used in "git diff $treeA $treeB" to borrow an already checked-out copy in the working tree when it is known to be the same as the blob being compared, expecting that open/mmap of such a file is faster than reading it from the object store, which involves inflating and applying delta. This however kicked in even when the checked-out copy needs to go through the convert-to-git conversion (including the clean filter), which defeats the whole point of the optimization. The optimization has been disabled when the conversion is necessary. * jk/diff-do-not-reuse-wtf-needs-cleaning: diff: do not reuse worktree files that need "clean" conversion
Diffstat (limited to 'diffcore-order.c')
0 files changed, 0 insertions, 0 deletions