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

Re: [PATCH 6/6] cherry-pick/revert: reject --rerere-autoupdate when continuing

From
Junio C Hamano <gitster@pobox.com>
Date
Aug 2, 2017, 21:57 UTC
Message-ID
<xmqqpocdr5tu.fsf@gitster.mtv.corp.google.com>
In-Reply-To
<20170802104420.12809-7-phillip.wood@talktalk.net>
Phillip Wood <phillip.wood@talktalk.net> writes:
> From: Phillip Wood <phillip.wood@dunelm.org.uk>
>
> cherry-pick and revert should not accept --[no-]rerere-autoupdate once
> they have started.

Hmph, why shouldn't they? In other words, shouldn't the usual "try to carry forward from the original invocation (saved in the state file), but allow overriding from the command line" rule apply?

I took a brief look at earlier steps and I thought 1-4/6 were all good. I am not sure (yet) about these last two patches.

Thanks for working on this topic.
Previous: Phillip WoodNext: Junio C Hamano
Message 4 of 12 in “am/cherry-pick/rebase/revert --rerere-autoupdate fixes”
  1. 0/6 am/cherry-pick/rebase/revert --rerere-autoupdate fixesPhillip Wood, Aug 2, 2017
  2. 2/6 rebase: honor --rerere-autoupdatePhillip Wood, Aug 2, 2017
  3. 6/6 cherry-pick/revert: reject --rerere-autoupdate when continuingPhillip Wood, Aug 2, 2017
  4. Junio C HamanoAug 2, 2017
  5. Junio C HamanoAug 2, 2017
  6. Phillip WoodAug 3, 2017
  7. Junio C HamanoAug 3, 2017
  8. Phillip WoodAug 7, 2017
  9. 1/6 am: remember --rerere-autoupdate settingPhillip Wood, Aug 2, 2017
  10. 3/6 rebase -i: honor --rerere-autoupdatePhillip Wood, Aug 2, 2017
  11. 5/6 cherry-pick/revert: remember --rerere-autoupdatePhillip Wood, Aug 2, 2017
  12. 4/6 t3504: use test_commitPhillip Wood, Aug 2, 2017

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.