summaryrefslogtreecommitdiff
path: root/mergetools/opendiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-10-23 13:33:08 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-10-23 13:33:08 -0700
commite03a5010b3fc17a1d559ae0fdbcdad63af8e30c9 (patch)
tree54ec5075e4781875b4d10cc91860a0247b0d4d2d /mergetools/opendiff
parentMerge branch 'jh/checkout-auto-tracking' into maint (diff)
parentdir.c::test_one_path(): work around directory_exists_in_index_icase() breakage (diff)
downloadtgif-e03a5010b3fc17a1d559ae0fdbcdad63af8e30c9.tar.xz
Merge branch 'jc/ls-files-killed-optim' into maint
"git ls-files -k" needs to crawl only the part of the working tree that may overlap the paths in the index to find killed files, but shared code with the logic to find all the untracked files, which made it unnecessarily inefficient. * jc/ls-files-killed-optim: dir.c::test_one_path(): work around directory_exists_in_index_icase() breakage t3010: update to demonstrate "ls-files -k" optimization pitfalls ls-files -k: a directory only can be killed if the index has a non-directory dir.c: use the cache_* macro to access the current index
Diffstat (limited to 'mergetools/opendiff')
0 files changed, 0 insertions, 0 deletions