From: Junio C Hamano <gitster@pobox.com>
To: Duy Nguyen <pclouds@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH 2/2] cherry-pick: fix --quit not deleting CHERRY_PICK_HEAD
Date: Wed, 15 Aug 2018 10:33:54 -0700 [thread overview]
Message-ID: <xmqqlg97ilfh.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <CACsJy8CkXRc9NXRHt3a7=v04to0bMTvZo9x7zYNZWPiGDKQqdg@mail.gmail.com> (Duy Nguyen's message of "Wed, 15 Aug 2018 19:30:33 +0200")
Duy Nguyen <pclouds@gmail.com> writes:
> On Wed, Aug 15, 2018 at 7:26 PM Junio C Hamano <gitster@pobox.com> wrote:
>>
>> Please do not hide this bugfix behind 1/2 that is likely to require
>> longer to cook than the fix itself. And more importantly, it makes
>> it impossible to merge down the fix to the maintenance track, as I
>> do not think we'd want to merge 1/2 there.
>
> Oh sorry I did not think about that. Will drop 1/2 and send 2/2 as
> standalone. But for the record, I think this has been a bug since the
> introduction of --quit in this command (back when it was still called
> --reset).
If this bug has been there longer, it is a reason why we may want to
ensure that the fix applies to even older maintenance tracks.
Thanks.
next prev parent reply other threads:[~2018-08-15 17:33 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-15 16:23 [PATCH 1/2] branch.c: remove explicit reference to the_repository Nguyễn Thái Ngọc Duy
2018-08-15 16:23 ` [PATCH 2/2] cherry-pick: fix --quit not deleting CHERRY_PICK_HEAD Nguyễn Thái Ngọc Duy
2018-08-15 17:09 ` Stefan Beller
2018-08-15 17:17 ` Duy Nguyen
2018-08-15 17:22 ` Stefan Beller
2018-08-15 17:26 ` Junio C Hamano
2018-08-15 17:30 ` Duy Nguyen
2018-08-15 17:33 ` Junio C Hamano [this message]
2018-08-16 16:06 ` [PATCH v2] " Nguyễn Thái Ngọc Duy
2018-08-16 17:02 ` Junio C Hamano
2018-08-15 16:48 ` [PATCH 1/2] branch.c: remove explicit reference to the_repository Elijah Newren
2018-08-15 16:52 ` Duy Nguyen
2018-08-15 16:58 ` Stefan Beller
2018-08-15 17:11 ` Duy Nguyen
2018-08-15 17:38 ` Junio C Hamano
2018-08-15 17:43 ` Duy Nguyen
2018-08-15 17:20 ` Junio C Hamano
2018-08-15 17:23 ` Duy Nguyen
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=xmqqlg97ilfh.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--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.
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 NNTP newsgroup(s).