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

[PATCH 0/2] built-in rebase --autostash: fix regression

From
Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>
Date
Nov 7, 2018, 14:00 UTC
Message-ID
<pull.70.git.gitgitgadget@gmail.com>

It was reported that the new, shiny built-in git rebase has a bug where it would detach the HEAD when it was not even necessary to detach it.

Keeping with my fine tradition to first demonstrate what is the actual problem (and making it easy to verify my claim), this patch series first introduces the regression test, and then the (quite simple) fix.

AEvar, sorry for the ASCII-fication of your name, I still did not find the time to look at the GitGitGadget bug closely where it does the wrong thing when Cc:ing with non-ASCII names.

Johannes Schindelin (2):
  built-in rebase: demonstrate regression with --autostash
  built-in rebase --autostash: leave the current branch alone if
    possible
 builtin/rebase.c            | 3 ++-
 t/t3420-rebase-autostash.sh | 8 ++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)
base-commit: 8858448bb49332d353febc078ce4a3abcc962efe
Published-As: https://github.com/gitgitgadget/git/releases/tags/pr-70%2Fdscho%2Ffix-built-in-rebase-autostash-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-70/dscho/fix-built-in-rebase-autostash-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/70
-- 
gitgitgadget
Next: Johannes Schindelin via GitGitGadget
Message 1 of 4 in “built-in rebase --autostash: fix regression”
  1. 0/2 built-in rebase --autostash: fix regressionJohannes Schindelin via GitGitGadget, Nov 7, 2018
  2. 1/2 built-in rebase: demonstrate regression with --autostashJohannes Schindelin via GitGitGadget, Nov 7, 2018
  3. 2/2 built-in rebase --autostash: leave the current branch alone if possibleJohannes Schindelin via GitGitGadget, Nov 7, 2018
  4. Jeff KingNov 7, 2018

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.