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

Re: [PATCH] rebase -i: Teach "--edit" action

From
Andrew Wong <andrew.kw.w@gmail.com>
Date
Sep 10, 2012, 16:46 UTC
Message-ID
<CADgNja=z7EDTV8_2CU9Uc7w=Dmtp90GrPkDUFSPbucfyrEsBaQ@mail.gmail.com>
In-Reply-To
<vpqk3w1j15v.fsf@bauges.imag.fr>

On Mon, Sep 10, 2012 at 12:25 PM, Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> wrote:

> Indent with space. Please, use tabs (same below).
Ah, thanks. Good catch.
> Just "edit" may be a bit misleading, as we already have the "edit"
> action inside the todolist. I'd call this --edit-list to avoid
> ambiguity.

I thought that might be a bit confusing too. "--edit-list" doesn't seem informative about what "list" we're editing though. What about "--edit-todo"? Any suggestions are welcomed.

> This lacks tests, IMHO, as there are many corner-cases (e.g. should we
> be allowed to --edit-list while the worktree is in conflict?) that would
> deserve to be at least discussed, and as much as possible automatically
> tested.

It does seem risky to do, since we're exposing something that used to be internal to "rebase -i". Though I don't see harm in allowing modifications even when there's a conflict, since we're not really committing anything, modifying index, or any worktree file. As long as the todo file exists, and we're stopped in the middle of a rebase, I think editing it shouldn't cause any problems.

Previous: Matthieu MoyNext: Jeff King
Message 4 of 34 in “[RFC] Add "edit" action for interactive rebase?”
  1. Andrew WongSep 10, 2012
  2. rebase -i: Teach "--edit" actionAndrew Wong, Sep 10, 2012
  3. Matthieu MoySep 10, 2012
  4. Andrew WongSep 10, 2012
  5. Jeff KingSep 10, 2012
  6. Johannes SixtSep 10, 2012
  7. Jeff KingSep 10, 2012
  8. Andrew WongSep 10, 2012
  9. Junio C HamanoSep 10, 2012
  10. Andrew WongSep 10, 2012
  11. 0/3 rebase -i: Teach "--edit-todo"Andrew Wong, Sep 15, 2012
  12. 1/3 rebase -i: Refactor help messages for todo fileAndrew Wong, Sep 15, 2012
  13. 2/3 rebase -i: Teach "--edit-todo" actionAndrew Wong, Sep 15, 2012
  14. Junio C HamanoSep 16, 2012
  15. Andrew WongSep 16, 2012
  16. Junio C HamanoSep 18, 2012
  17. 3/3 rebase -i: Add tests for "--edit-todo"Andrew Wong, Sep 15, 2012
  18. Junio C HamanoSep 16, 2012
  19. 1/3 rebase -i: Refactor help messages for todo fileAndrew Wong, Sep 16, 2012
  20. 2/3 rebase -i: Teach "--edit-todo" actionAndrew Wong, Sep 16, 2012
  21. Martin von ZweigbergkSep 17, 2012
  22. 0/4 rebase -i: Teach "--edit-todo" actionAndrew Wong, Sep 18, 2012
  23. 1/4 rebase usage: subcommands can not be combined with -iAndrew Wong, Sep 18, 2012
  24. 2/4 rebase -i: Refactor help messages for todo fileAndrew Wong, Sep 18, 2012
  25. 3/4 rebase -i: Teach "--edit-todo" actionAndrew Wong, Sep 18, 2012
  26. 4/4 rebase -i: Add tests for "--edit-todo"Andrew Wong, Sep 18, 2012
  27. Martin von ZweigbergkSep 18, 2012
  28. Andrew WongSep 18, 2012
  29. Martin von ZweigbergkSep 18, 2012
  30. 5/4 rebase -i: suggest using --edit-todo to fix an unknown instructionJohannes Sixt, Sep 19, 2012
  31. Junio C HamanoSep 19, 2012
  32. 3/3 rebase -i: Add tests for "--edit-todo"Andrew Wong, Sep 16, 2012
  33. Johannes SixtSep 10, 2012
  34. Andrew WongSep 10, 2012

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.