found by and ok op@, who also provided the test case

ok jamsek, op

This behaviour is already documented in got-worktree(5) but wasn't actually implemented. ok stsp@

ok jrick

unset only in the subshell so further cose is unaffected. ok stsp@

My commit to reset committer info during rebase was too strict in some use cases. Even when simply forwarding a branch the rebase operation could now fail if GOT_AUTHOR is not set. To fix this, fall back on existing commiter information if no author is configured. And try to obtain author info from Git config in case GOT_AUTHOR is not set. Problems reported by Mikhail.

ok op@

reported by naddy

This brings the rest of the regression test scripts in line with patch.sh.

Always update to the specified branch even if the branch is already rebased (no commits needed to be rebased, and the branch does not need a fast forward). With the old behavior of erroring and staying on the current branch, I sometimes found myself ignoring the error message, treating it as information and assuming the branch update, and later on committing on top of origin/main instead of the main branch. feedback and ok stsp

ok jrick

ok stsp@

ok semarie

This was a long-standing and very annoying bug. The two xfail tests in the cherrypick test suite are passing now.

Create automatic "backup" references which ensure that objects from the pre-rebase or pre-histedit state remain in the repository. A new -l option for 'got rebase' and 'got histedit' lists old commits. This makes it easier to recover from botched rebase or histedit operations. Removal of such objects currently requires got ref -d and git-gc. This will be made more convenient in the future. testing and ok jrick