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.
Or you could make another step ahead and make fast_forward_merge aware
of sparse checkout too ;-)
--
Duy
--
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