On Sun, Apr 15, 2018 at 5:37 PM, Junio C Hamano wrote:
> Elijah Newren writes:
>
>> @@ -362,13 +363,17 @@ static int git_merge_trees(struct merge_options *o,
>> init_tree_desc_from_tree(t+2, merge);
>>
>> rc = unpack_trees(3, t, &o->unpack_opts);
>> + cache_tree_free(&active_cache
Elijah Newren writes:
> @@ -362,13 +363,17 @@ static int git_merge_trees(struct merge_options *o,
> init_tree_desc_from_tree(t+2, merge);
>
> rc = unpack_trees(3, t, &o->unpack_opts);
> + cache_tree_free(&active_cache_tree);
> +
> + o->orig_index = the_index;
> + the_ind
In commit aacb82de3ff8 ("merge-recursive: Split was_tracked() out of
would_lose_untracked()", 2011-08-11), was_tracked() was split out of
would_lose_untracked() with the intent to provide a function that could
answer whether a path was tracked in the index before the merge. Sadly,
it instead retur
3 matches
Mail list logo