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

Re: [PATCH] status: be prepared for not-yet-started interactive rebase

From
Junio C Hamano <gitster@pobox.com>
Date
Jan 22, 2016, 18:38 UTC
Message-ID
<xmqqio2lv4rg.fsf@gitster.mtv.corp.google.com>
In-Reply-To
<vpqlh7h5zrh.fsf@anie.imag.fr>
Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> writes:
Show 7 quoted lines
> Johannes Schindelin <johannes.schindelin@gmx.de> writes:
>
>>  wt-status.c | 22 +++++++++++++++-------
>>  1 file changed, 15 insertions(+), 7 deletions(-)
>
> Looks good to me. You may want to add a test by overriding $EDITOR to a
> script doing "git status >actual" if you want to have fun with testing.

I am unhappy that the code does not read 'rebase-todo' at all when 'done' is missing.

If we cannot read 'todo', that would mean we shouldn't be in this function in the first place, which is a sign of something more serious; somebody created 'interactive' but did not leave 'todo' to read for us--why?

A missing 'done' is much more benign and making us not to barf is a worthy thing to do, but we shouldn't be removing protection against a more serious error as its side effect. That is what I am unhappy about this change.

Previous: Johannes SchindelinNext: Johannes Schindelin
Message 4 of 10 in “status: be prepared for not-yet-started interactive rebase”
  1. status: be prepared for not-yet-started interactive rebaseJohannes Schindelin, Jan 22, 2016
  2. Matthieu MoyJan 22, 2016
  3. Johannes SchindelinJan 22, 2016
  4. Junio C HamanoJan 22, 2016
  5. Johannes SchindelinJan 22, 2016
  6. 0/1 Let `git status` handle a not-yet-started `rebase -i` gracefullyJohannes Schindelin, Jan 26, 2017
  7. 1/1 status: be prepared for not-yet-started interactive rebaseJohannes Schindelin, Jan 26, 2017
  8. Matthieu MoyJan 26, 2017
  9. Stefan BellerJan 26, 2017
  10. Johannes SchindelinJan 27, 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.