Re: [PATCH] unpack_trees(): skip trees that are the same in all input

From: Nguyen Thai Ngoc Duy <pclouds@gmail.com>
Date: Dec 29, 2010, 14:43 UTC
Message-ID: <AANLkTinm=k_84Nh4YakbkdNNLO4-yeVxGF+p_rR5TFB=@mail.gmail.com>
In-Reply-To: <7vr5d94fs4.fsf@alter.siamese.dyndns.org>

On Thu, Dec 23, 2010 at 5:13 AM, Junio C Hamano <gitster@pobox.com> wrote:

Show 9 quoted lines

> @@ -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