Nguyen Thai Ngoc Duy <pclouds@xxxxxxxxx> writes:
> On Thu, Dec 23, 2010 at 5:13 AM, Junio C Hamano <gitster@xxxxxxxxx> wrote:
>> @@ -447,6 +451,11 @@ static int traverse_trees_recursive(int n, unsigned long dirmask,
>> struct traverse_info newinfo;
>> struct name_entry *p;
>>
>> + if (!df_conflicts) {
>> + int status = fast_forward_merge(n, dirmask, names, info);
>> + if (status)
>> + return status;
>> + }
>
> Also skip the optimization when sparse checkout is active
> (info->data->skip_sparse_checkout == 0). People may need to just
> update skip-worktree bits and add/remove worktree files along the
> line.
Sounds sensible and safer to special case that one, I would agree.
By the way, I think info->data->skip_sparse_checkout should be fixed by
renaming it to info->data->sparse_checkout. The flag controls a special
case logic that should not be in effect unless explicitly asked, and
forcing normal codepath to say "If skip_sparse_checkout is not false, do
this" in double-negative is unnice than "If sparse_checkout is in effect,
please run this special case" when reading the code.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html