From: Junio C Hamano <gitster@pobox•com>
To: Paul Tan <pyokagan@gmail•com>
Cc: Git List <git@vger•kernel.org>,
Johannes Schindelin <johannes.schindelin@gmx•de>,
Stefan Beller <sbeller@google•com>
Subject: Re: [RFC] git-am: handling unborn branches
Date: Fri, 05 Jun 2015 08:36:37 -0700 [thread overview]
Message-ID: <xmqqfv66tbei.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <CACRoPnS9UK0ebD2JdSfun8+F0MXj6Loza4Y07whqbO6tV4_APQ@mail.gmail.com> (Paul Tan's message of "Fri, 5 Jun 2015 14:37:24 +0800")
Paul Tan <pyokagan@gmail•com> writes:
> Hmm, actually git-am.sh doesn't seem to do that even when we have a
> history to apply patches to. This is okay in the non-3way case, as
> git-apply will check to see if the patch applies before it modifies
> the index, but if we fall back on 3-way merge, any new files the
> failed merge added will not be deleted in the "git read-tree --reset
> -u HEAD HEAD".
>
> Should we do that?
That sounds like the right thing to do; I agree that fixing it may
or may not be outside the scope of the immediate series.
next prev parent reply other threads:[~2015-06-05 15:36 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-04 10:34 [RFC] git-am: handling unborn branches Paul Tan
2015-06-04 17:26 ` Junio C Hamano
2015-06-05 6:37 ` Paul Tan
2015-06-05 15:36 ` Junio C Hamano [this message]
2015-06-05 16:26 ` Paul Tan
2015-06-05 16:33 ` Junio C Hamano
2015-06-04 17:27 ` Stefan Beller
2015-06-05 8:32 ` Paul Tan
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqfv66tbei.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=johannes.schindelin@gmx$(echo .)de \
--cc=pyokagan@gmail$(echo .)com \
--cc=sbeller@google$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox