summaryrefslogtreecommitdiff
path: root/t/t7610-mergetool.sh
diff options
context:
space:
mode:
authorLibravatar Nguyễn Thái Ngọc Duy <pclouds@gmail.com>2018-09-21 17:57:18 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-09-21 09:48:10 -0700
commit92a1bf5a58920e5f1f51106f06cd9dc6d6eb6c43 (patch)
tree7e4fbf1772d3e75f2c38aae41b3a3226b430821b /t/t7610-mergetool.sh
parentarchive.c: remove implicit dependency the_repository (diff)
downloadtgif-92a1bf5a58920e5f1f51106f06cd9dc6d6eb6c43.tar.xz
read-cache.c: remove 'const' from index_has_changes()
This function calls do_diff_cache() which eventually needs to set this "istate" to unpack_options->src_index [1]. This is an unfortunate fact that unpack_trees() _will_ update [2] src_index so we can't really pass a const index_state there. Just remove 'const'. [1] Right now diff_cache() in diff-lib.c assigns the_index to src_index. But the plan is to get rid of the_index, so it should be 'istate' from here that gets assigned to src_index. [2] Some transient bits in the source index are touched. Optional extensions can also be removed. But other than that the source tree should still be valid. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7610-mergetool.sh')
0 files changed, 0 insertions, 0 deletions