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

[PATCH 0/5] A couple of sequencer cleanups

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Dec 22, 2017, 23:55 UTC
Message-ID
<cover.1513986836.git.johannes.schindelin@gmx.de>

While working on patches to teach `git rebase -i` to recreate branch topology properly, i.e. replace the design of `--preserve-merges` by something much better, I stumbled across a couple of issues that I thought I should fix on the way.

The patches are based on lb/rebase-i-short-command-names, mainly because the new `--recreate-merges` patches benefit from the patch "rebase -i: update functions to use a flags parameter", and I was too lazy to resolve the merge conflicts while rebasing the patch "sequencer: do not invent whitespace when transforming OIDs" to the current `master` branch.

Oh, and by the way, the `--recreate-merges` feature already works. I used it to develop the patches themselves. I do not have time to pass one last time over them, so they'll have to wait for next year to see the Git mailing list. If anyone wants to have a look over them, play with them, or even wants to review the patches:

	https://github.com/git/git/compare/master...dscho:sequencer-shears
Johannes Schindelin (5):
  rebase: do not continue when the todo list generation failed
  sequencer: strip bogus LF at end of error messages
  sequencer: remove superfluous conditional
  sequencer: report when noop has an argument
  sequencer: do not invent whitespace when transforming OIDs
 git-rebase--interactive.sh |  3 ++-
 sequencer.c                | 30 ++++++++++++++++++------------
 2 files changed, 20 insertions(+), 13 deletions(-)
base-commit: 1795993488bef1b48e4224db096e9d12df075db2
Based-On: lb/rebase-i-short-command-names at https://github.com/dscho/git
Fetch-Base-Via: git fetch https://github.com/dscho/git lb/rebase-i-short-command-names
Published-As: https://github.com/dscho/git/releases/tag/sequencer-cleanups-v1
Fetch-It-Via: git fetch https://github.com/dscho/git sequencer-cleanups-v1
-- 
2.15.1.windows.2
Next: Johannes Schindelin
Message 1 of 8 in “A couple of sequencer cleanups”
  1. 0/5 A couple of sequencer cleanupsJohannes Schindelin, Dec 22, 2017
  2. 1/5 rebase: do not continue when the todo list generation failedJohannes Schindelin, Dec 22, 2017
  3. 2/5 sequencer: strip bogus LF at end of error messagesJohannes Schindelin, Dec 22, 2017
  4. 3/5 sequencer: remove superfluous conditionalJohannes Schindelin, Dec 22, 2017
  5. 4/5 sequencer: report when noop has an argumentJohannes Schindelin, Dec 22, 2017
  6. 5/5 sequencer: do not invent whitespace when transforming OIDsJohannes Schindelin, Dec 22, 2017
  7. Liam BeguinDec 27, 2017
  8. Junio C HamanoDec 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.