Browse Source

entry.c: use the right index instead of the_index

checkout-index.c needs update because if checkout->istate is NULL,
ie_match_stat() will crash. Previously this is ie_match_stat(&the_index, ..)
so it will not crash, but it is not technically correct either.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Nguyễn Thái Ngọc Duy 6 years ago committed by Junio C Hamano
parent
commit
74cfc0ee1d
  1. 1
      builtin/checkout-index.c
  2. 9
      entry.c

1
builtin/checkout-index.c

@ -190,6 +190,7 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix) @@ -190,6 +190,7 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix)

argc = parse_options(argc, argv, prefix, builtin_checkout_index_options,
builtin_checkout_index_usage, 0);
state.istate = &the_index;
state.force = force;
state.quiet = quiet;
state.not_new = not_new;

9
entry.c

@ -266,7 +266,7 @@ static int write_entry(struct cache_entry *ce, @@ -266,7 +266,7 @@ static int write_entry(struct cache_entry *ce,
const struct submodule *sub;

if (ce_mode_s_ifmt == S_IFREG) {
struct stream_filter *filter = get_stream_filter(&the_index, ce->name,
struct stream_filter *filter = get_stream_filter(state->istate, ce->name,
&ce->oid);
if (filter &&
!streaming_write_entry(ce, path, filter,
@ -314,14 +314,14 @@ static int write_entry(struct cache_entry *ce, @@ -314,14 +314,14 @@ static int write_entry(struct cache_entry *ce,
* Convert from git internal format to working tree format
*/
if (dco && dco->state != CE_NO_DELAY) {
ret = async_convert_to_working_tree(&the_index, ce->name, new_blob,
ret = async_convert_to_working_tree(state->istate, ce->name, new_blob,
size, &buf, dco);
if (ret && string_list_has_string(&dco->paths, ce->name)) {
free(new_blob);
goto delayed;
}
} else
ret = convert_to_working_tree(&the_index, ce->name, new_blob, size, &buf);
ret = convert_to_working_tree(state->istate, ce->name, new_blob, size, &buf);

if (ret) {
free(new_blob);
@ -422,7 +422,8 @@ int checkout_entry(struct cache_entry *ce, @@ -422,7 +422,8 @@ int checkout_entry(struct cache_entry *ce,

if (!check_path(path.buf, path.len, &st, state->base_dir_len)) {
const struct submodule *sub;
unsigned changed = ce_match_stat(ce, &st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE);
unsigned changed = ie_match_stat(state->istate, ce, &st,
CE_MATCH_IGNORE_VALID | CE_MATCH_IGNORE_SKIP_WORKTREE);
/*
* Needs to be checked before !changed returns early,
* as the possibly empty directory was not changed

Loading…
Cancel
Save