Re: [PATCH] unpack-trees: do not fail reset because of unmerged skipped entry

Duy Nguyen [off-list ref] writes:

On Tue, Jul 10, 2018 at 9:22 PM Max Kirillov [off-list ref] wrote:

quoted

On Sat, Jun 16, 2018 at 07:14:44AM +0200, Duy Nguyen wrote:

quoted

-- 8< --

diff --git a/unpack-trees.c b/unpack-trees.c
index 3a85a02a77..eb544ee1b3 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c

@@ -1246,7 +1246,7 @@ static void mark_new_skip_worktree(struct exclude_list *el,
              if (select_flag && !(ce->ce_flags & select_flag))
                      continue;

-             if (!ce_stage(ce))
+             if (!ce_stage(ce) && !(ce->ce_flags & CE_CONFLICTED))
                      ce->ce_flags |= skip_wt_flag;
              else
                      ce->ce_flags &= ~skip_wt_flag;
-- 8< --

I tried your fix and it is working. I put it instead of my original fix. Would you sign it off?

Signed-off-by: Duy Nguyen <redacted>

Thanks, both.