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

Re: [PATCH] rebase: mention --abort alongside --continue

From
Junio C Hamano <gitster@pobox.com>
Date
Jun 19, 2026, 01:36 UTC
Message-ID
<xmqqa4srnwfa.fsf@gitster.g>
In-Reply-To
<CAHwyqnV8je6gCTExr=CFCdYskN1dVaEDVSKDLUo5A4Ukv=qhiA@mail.gmail.com>
Harald Nordgren <haraldnordgren@gmail.com> writes:
Show 25 quoted lines
> Just an example when working on a different topic:
>
> I rebased with -x to run all the tests, but ran a test that didn't
> exist yet on the first commit and ended up in a bad state. Here it
> should clearly show the 'git rebase --abort', so I can start over,
> it's not something to fix:
>
> ```
> $ git rebase --keep-base -x 'make -s' -x 'cd t && prove -j8
> t3454-history-squash.sh t3453-history-fixup.sh t3452-history-split.sh
> t3451-history-reword.sh t3450-history.sh'
> Executing: make -s
> GIT_VERSION=2.55.0.rc1.20.g1e31474ef6
> Executing: cd t && prove -j8 t3454-history-squash.sh
> t3453-history-fixup.sh t3452-history-split.sh t3451-history-reword.sh
> t3450-history.sh
> Cannot detect source of 't3454-history-squash.sh'! at
> /System/Library/Perl/5.34/TAP/Parser/IteratorFactory.pm line 256.
> ...
> warning: execution failed: cd t && prove -j8 t3454-history-squash.sh
> t3453-history-fixup.sh t3452-history-split.sh t3451-history-reword.sh
> t3450-history.sh
> You can fix the problem, and then run
>
>   git rebase --continue

Hmph, you do not have to "fix" as you know some of the test scripts did not exist at this stage. So the solution to the issue seems to be just to say "git rebase --continue", instead of starting over by aborting. It is especially true if the test scripts are introduced in the middle of this rebase session somewhere later in the series, no?

Of course if you gave a totally broken script to "-x" option, you'd need to be able to abort it, but is that the use case we should be giving one extra line of output for users in all other situations? I dunno.

Previous: Harald NordgrenNext: Harald Nordgren
Message 8 of 14 in “rebase: mention --abort alongside --continue”
  1. rebase: mention --abort alongside --continueHarald Nordgren via GitGitGadget, Jun 15, 2026
  2. Phillip WoodJun 16, 2026
  3. Junio C HamanoJun 16, 2026
  4. Harald NordgrenJun 17, 2026
  5. Phillip WoodJun 17, 2026
  6. Junio C HamanoJun 17, 2026
  7. Harald NordgrenJun 18, 2026
  8. Junio C HamanoJun 19, 2026
  9. Harald NordgrenJul 16, 2026
  10. Phillip WoodJul 16, 2026
  11. Junio C HamanoJul 16, 2026
  12. Harald NordgrenJul 18, 2026
  13. Phillip WoodJul 18, 2026
  14. Junio C HamanoJul 20, 2026

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.