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

Re: [PATCH v3] sequencer: rectify empty hint in call of require_clean_work_tree()

From
Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
Date
Aug 10, 2023, 11:24 UTC
Message-ID
<ZNTI6xpXIRaoFlxx@ugly>
In-Reply-To
<xmqq7cq3lwli.fsf@gitster.g>
On Wed, Aug 09, 2023 at 02:44:25PM -0700, Junio C Hamano wrote:
Show 9 quoted lines
>"git rebase" does not seem to start (i.e. does not perform "initial
>checkout") from a dirty working tree, with
>
>	error: cannot rebase: You have unstaged changes.
>	error: Please commit or stash them.
>
>at least from my quick attempt.  I am not sure if this is actually
>triggerble?
>
hmm, unless i'm missing something, it is apparently not ... currently.

it becomes actually relevant only after my "rebase: improve resumption from incorrect initial todo list" patch, which still needs reworking.

so there are several possibilities how to proceed with this:
- you merge it as a merely theoretical fix (adjust the commit message 
   yourself if saving the round-trip is more convenient for you)
- we postpone the change until it becomes not theoretical
- we make sure that the code really is not triggerable and delete it.  
   this would obviously introduce some churn, as i'll need to 
   re-introduce it. but then, i remember that something was wrong with it 
   anyway (i.e., it didn't actually trigger in some cases i expected it 
   to, but i haven't figured out yet why), so the new code would be 
   slightly different anyway.
regards
Previous: Junio C HamanoNext: Junio C Hamano
Message 11 of 15 in “sequencer: rectify empty hint in call of require_clean_work_tree()”
  1. sequencer: rectify empty hint in call of require_clean_work_tree()Oswald Buddenhagen, Mar 23, 2023
  2. Oswald BuddenhagenApr 27, 2023
  3. Junio C HamanoApr 27, 2023
  4. Oswald BuddenhagenApr 27, 2023
  5. Felipe ContrerasMay 2, 2023
  6. Oswald BuddenhagenMay 3, 2023
  7. sequencer: rectify empty hint in call of require_clean_work_tree()Oswald Buddenhagen, Aug 7, 2023
  8. Junio C HamanoAug 7, 2023
  9. sequencer: rectify empty hint in call of require_clean_work_tree()Oswald Buddenhagen, Aug 9, 2023
  10. Junio C HamanoAug 9, 2023
  11. Oswald BuddenhagenAug 10, 2023
  12. Junio C HamanoAug 10, 2023
  13. sequencer: rectify empty hint in call of require_clean_work_tree()Oswald Buddenhagen, Aug 24, 2023
  14. Junio C HamanoAug 24, 2023
  15. Junio C HamanoAug 9, 2023

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.