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
Junio C Hamano <gitster@pobox.com>
Date
Aug 9, 2023, 21:44 UTC
Message-ID
<xmqq7cq3lwli.fsf@gitster.g>
In-Reply-To
<20230809171531.2564829-1-oswald.buddenhagen@gmx.de>
Oswald Buddenhagen <oswald.buddenhagen@gmx.de> writes:
> The canonical way to represent "no error hint" is making it NULL, which
> shortcuts the error() call altogether. This fixes the output by removing
> the line which said just "error:", which would appear when starting a
> rebase whose initial checkout worked fine despite a dirty worktree. This
Thanks for adding this info.  

"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?

In any case, I've replaced v2 that I had with this version, as the description is much better. The change to the code does look correct but now it does not seem to trigger, it is unclear to me if the fix is merely theoretical (a command-by-command transcript would have helped here).

Thanks.
Previous: Oswald BuddenhagenNext: Oswald Buddenhagen
Message 10 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.