aboutsummaryrefslogtreecommitdiffstats
path: root/builtin/commit.c
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2018-08-13 18:14:28 +0200
committerJunio C Hamano <gitster@pobox.com>2018-08-13 14:14:43 -0700
commit27c82fb3b406e01bbcd6c7cb11dc1925b88f6a92 (patch)
tree9cee10666f65575ca081e51f2dbecbb35c5982b9 /builtin/commit.c
parentunpack-trees: don't shadow global var the_index (diff)
downloadgit-27c82fb3b406e01bbcd6c7cb11dc1925b88f6a92.tar.gz
git-27c82fb3b406e01bbcd6c7cb11dc1925b88f6a92.zip
unpack-trees: convert clear_ce_flags* to avoid the_index
Prior to fba92be8f7, this code implicitly (and incorrectly) assumes the_index when running the exclude machinery. fba92be8f7 helps show this problem clearer because unpack-trees operation is supposed to work on whatever index the caller specifies... not specifically the_index. Update the code to use "istate" argument that's originally from mark_new_skip_worktree(). From the call sites, both in unpack_trees(), you can see that this function works on two separate indexes: o->src_index and o->result. The second mark_new_skip_worktree() so far has incorecctly applied exclude rules on o->src_index instead of o->result. It's unclear what is the consequences of this, but it's definitely wrong. [1] fba92be8f7 (dir: convert is_excluded_from_list to take an index - 2017-05-05) 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 'builtin/commit.c')
0 files changed, 0 insertions, 0 deletions