git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 2/2] cherry-pick: fix --quit not deleting CHERRY_PICK_HEAD

From
Junio C Hamano <gitster@pobox.com>
Date
Aug 15, 2018, 17:33 UTC
Message-ID
<xmqqlg97ilfh.fsf@gitster-ct.c.googlers.com>
In-Reply-To
<CACsJy8CkXRc9NXRHt3a7=v04to0bMTvZo9x7zYNZWPiGDKQqdg@mail.gmail.com>
Duy Nguyen <pclouds@gmail.com> writes:
Show 11 quoted lines
> 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.
Previous: Duy NguyenNext: Nguyễn Thái Ngọc Duy
Message 8 of 18 in “branch.c: remove explicit reference to the_repository”
  1. 1/2 branch.c: remove explicit reference to the_repositoryNguyễn Thái Ngọc Duy, Aug 15, 2018
  2. 2/2 cherry-pick: fix --quit not deleting CHERRY_PICK_HEADNguyễn Thái Ngọc Duy, Aug 15, 2018
  3. Stefan BellerAug 15, 2018
  4. Duy NguyenAug 15, 2018
  5. Stefan BellerAug 15, 2018
  6. Junio C HamanoAug 15, 2018
  7. Duy NguyenAug 15, 2018
  8. Junio C HamanoAug 15, 2018
  9. cherry-pick: fix --quit not deleting CHERRY_PICK_HEADNguyễn Thái Ngọc Duy, Aug 16, 2018
  10. Junio C HamanoAug 16, 2018
  11. Elijah NewrenAug 15, 2018
  12. Duy NguyenAug 15, 2018
  13. Stefan BellerAug 15, 2018
  14. Duy NguyenAug 15, 2018
  15. Junio C HamanoAug 15, 2018
  16. Duy NguyenAug 15, 2018
  17. Junio C HamanoAug 15, 2018
  18. Duy NguyenAug 15, 2018

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.