From: Andrew Wong <andrew.w@sohovfx.com>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: Ramkumar Ramachandra <artagnon@gmail.com>,
Andrew Wong <andrew.kw.w@gmail.com>,
git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
Jay Soffian <jaysoffian@gmail.com>
Subject: Re: [PATCH] rebase -i: remove CHERRY_PICK_HEAD when cherry-pick failed
Date: Tue, 03 Apr 2012 17:22:06 -0400 [thread overview]
Message-ID: <4F7B69FE.9010600@sohovfx.com> (raw)
In-Reply-To: <20120403211219.GC19858@burratino>
On 04/03/2012 05:12 PM, Jonathan Nieder wrote:
> Jonathan Nieder wrote:
>
>> Cherry-pick does the merge, so it is what notices the merge conflict.
>> If you search for CHERRY_PICK_HELP in builtin/revert.c, the relevant
>> code should show up.
>>
> I was looking at an older git version. In newer gits, the code path
> in question lives at print_advice() in sequencer.c.
>
Yes, the code has been moved into sequencer now.
But what I meant was, regardless of who's calling "cherry-pick", if
"cherry-pick" runs into an error and needs to stop, it needs to save a
state so that it can do a "--continue". And this behavior should stay
the same regardless of who the caller is. And that means its callers
(e.g. "rebase -i") should know about this and do a cleanup when
"cherry-pick" failed.
next prev parent reply other threads:[~2012-04-03 21:22 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-31 22:56 Rebase regression in v1.7.9? Felipe Contreras
2012-02-01 17:27 ` Andrew Wong
2012-02-01 19:30 ` Felipe Contreras
2012-03-18 21:37 ` [PATCH] rebase -i: remove CHERRY_PICK_HEAD when cherry-pick failed Andrew Wong
2012-03-19 16:51 ` Junio C Hamano
2012-03-19 21:00 ` Andrew Wong
2012-03-24 20:03 ` Andrew Wong
2012-04-02 22:38 ` Andrew Wong
2012-04-02 23:08 ` Junio C Hamano
2012-04-03 5:15 ` Junio C Hamano
2012-04-03 6:32 ` Ramkumar Ramachandra
2012-04-03 14:45 ` Jonathan Nieder
2012-04-03 21:01 ` Andrew Wong
2012-04-03 21:08 ` Jonathan Nieder
2012-04-03 21:12 ` Jonathan Nieder
2012-04-03 21:22 ` Andrew Wong [this message]
2012-04-03 21:26 ` Jonathan Nieder
2012-04-03 23:11 ` Andrew Wong
2012-04-04 18:11 ` Jonathan Nieder
2012-04-04 19:23 ` Andrew Wong
2012-04-04 20:16 ` Jonathan Nieder
2012-04-04 20:20 ` Jonathan Nieder
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=4F7B69FE.9010600@sohovfx.com \
--to=andrew.w@sohovfx.com \
--cc=andrew.kw.w@gmail.com \
--cc=artagnon@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jaysoffian@gmail.com \
--cc=jrnieder@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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.