summaryrefslogtreecommitdiff
path: root/t/t7606-merge-custom.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-05-22 23:14:25 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-05-25 11:35:29 -0700
commita0919ced8a5efe938cf97c74a0f851cbbe00aaf6 (patch)
tree0e2fd9892101648379d29d4d59416a6b0b440ab5 /t/t7606-merge-custom.sh
parentOptimize "diff-index --cached" using cache-tree (diff)
downloadtgif-a0919ced8a5efe938cf97c74a0f851cbbe00aaf6.tar.xz
Avoid "diff-index --cached" optimization under --find-copies-harder
When find-copies-harder is in effect, the diff frontends are expected to feed all paths, not just changed paths, to the diffcore, so that copy sources can be picked up. In such a case, not descending into subtrees using the cache-tree information is simply wrong. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7606-merge-custom.sh')
0 files changed, 0 insertions, 0 deletions