git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Duy Nguyen <pclouds@gmail.com>
Cc: Max Kirillov <max@max630.net>, Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH] unpack-trees: do not fail reset because of unmerged skipped entry
Date: Wed, 11 Jul 2018 09:35:59 -0700	[thread overview]
Message-ID: <xmqq1sc94tn4.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <CACsJy8BVadBd1T2yoUhnxd21=c8SVaFqPXT8kk4NfnzGyBNOCw@mail.gmail.com> (Duy Nguyen's message of "Wed, 11 Jul 2018 17:25:46 +0200")

Duy Nguyen <pclouds@gmail.com> writes:

> On Tue, Jul 10, 2018 at 9:22 PM Max Kirillov <max@max630.net> wrote:
>>
>> On Sat, Jun 16, 2018 at 07:14:44AM +0200, Duy Nguyen wrote:
>> > -- 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 <pclouds@gmail.com>

Thanks, both.

  reply	other threads:[~2018-07-11 16:36 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-06-15  4:42 [PATCH] unpack-trees: do not fail reset because of unmerged skipped entry Max Kirillov
2018-06-15 19:58 ` Junio C Hamano
2018-06-16  8:22   ` Max Kirillov
2018-07-10 19:23   ` Max Kirillov
2018-06-16  5:14 ` Duy Nguyen
2018-07-10 19:21   ` Max Kirillov
2018-07-11 15:25     ` Duy Nguyen
2018-07-11 16:35       ` Junio C Hamano [this message]
2018-07-10 19:17 ` [PATCH v2] " Max Kirillov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqq1sc94tn4.fsf@gitster-ct.c.googlers.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=max@max630.net \
    --cc=pclouds@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).