kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'en/unpack-trees-split-index-fix' 

The split-index feature had a long-standing and dormant bug in
certain use of the in-core merge machinery, which has been fixed.

* en/unpack-trees-split-index-fix:
  unpack_trees: fix breakage when o->src_index != o->dst_index
maint
Junio C Hamano 2018-05-23 14:38:22 +09:00
parent 6b0f1d9c47 7db118303a
commit d658196f3c
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
unpack-trees.c
View File

@ -1284,9 +1284,20 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
o->result.timestamp.sec = o->src_index->timestamp.sec; o->result.timestamp.sec = o->src_index->timestamp.sec;
o->result.timestamp.nsec = o->src_index->timestamp.nsec; o->result.timestamp.nsec = o->src_index->timestamp.nsec;
o->result.version = o->src_index->version; o->result.version = o->src_index->version;
o->result.split_index = o->src_index->split_index; if (!o->src_index->split_index) {
if (o->result.split_index) o->result.split_index = NULL;
} else if (o->src_index == o->dst_index) {
/*
* o->dst_index (and thus o->src_index) will be discarded
* and overwritten with o->result at the end of this function,
* so just use src_index's split_index to avoid having to
* create a new one.
*/
o->result.split_index = o->src_index->split_index;
o->result.split_index->refcount++; o->result.split_index->refcount++;
} else {
o->result.split_index = init_split_index(&o->result);
}
hashcpy(o->result.sha1, o->src_index->sha1); hashcpy(o->result.sha1, o->src_index->sha1);
o->merge_size = len; o->merge_size = len;
mark_all_ce_unused(o->src_index); mark_all_ce_unused(o->src_index);
@ -1401,7 +1412,6 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
} }
} }


o->src_index = NULL;
ret = check_updates(o) ? (-2) : 0; ret = check_updates(o) ? (-2) : 0;
if (o->dst_index) { if (o->dst_index) {
if (!ret) { if (!ret) {
@ -1412,12 +1422,13 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
WRITE_TREE_SILENT | WRITE_TREE_SILENT |
WRITE_TREE_REPAIR); WRITE_TREE_REPAIR);
} }
move_index_extensions(&o->result, o->dst_index); move_index_extensions(&o->result, o->src_index);
discard_index(o->dst_index); discard_index(o->dst_index);
*o->dst_index = o->result; *o->dst_index = o->result;
} else { } else {
discard_index(&o->result); discard_index(&o->result);
} }
o->src_index = NULL;


done: done:
clear_exclude_list(&el); clear_exclude_list(&el);