mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

convert.c: remove an implicit dependency on the_index

Browse Source 
Make the convert API take an index_state instead of assuming the_index
in convert.c. All external call sites are converted blindly to keep
the patch simple and retain current behavior. Individual call sites
may receive further updates to use the right index instead of
the_index.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy
2018-08-13 18:14:21 +02:00
committed by Junio C Hamano
parent 7a400a2c02
commit 7f944e264e
10 changed files with 45 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
entry.c
View File

@ -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(ce->name,
struct stream_filter *filter = get_stream_filter(&the_index, ce->name,
&ce->oid);
if (filter &&
!streaming_write_entry(ce, path, filter,
@ -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(ce->name, new_blob,
ret = async_convert_to_working_tree(&the_index, 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(ce->name, new_blob, size, &buf);
ret = convert_to_working_tree(&the_index, ce->name, new_blob, size, &buf);
if (ret) {
free(new_blob);