add regression test which covers fast-forward rebase + path-prefix

forbid rebase of references outside the refs/heads/ namespace ok jrick

remove trailing whitespace; patch by Josiah Frentsos

don't undef GOT_AUTHOR in regress unset only in the subshell so further cose is unaffected. ok stsp@

do not require local author info during 'got rebase' 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.

reset committer during rebase and histedit ok op@

leave work tree in a usable state after 'got rebase' fails path-prefix checks reported by naddy

use test(1) -eq and -ne to compare integers, and reduce quoting This brings the rest of the regression test scripts in line with patch.sh.

switch branches during noop rebases 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

ignore unversioned files while aborting rebase, histedit, merge or operations ok jrick

interrupt 'got rebase' upon missing/unversioned/not-deleted files

print additional stats about things that went wrong during a merge

use the POSIX-compliant "date -u" command to return UTC time; ok stsp

add missing "return 1" to failure handling in the regress scripts ok stsp@

make 'got ref -d' print reference name and value like the new -X options do

new -X option for removing backups created by got rebase and got histedit ok semarie

fix unrelated changes being merged by got cherrypick/backout/rebase/histedit This was a long-standing and very annoying bug. The two xfail tests in the cherrypick test suite are passing now.

rebase/histedit -l: error out if no backups for the requested branch exist

ensure that old commits remain referenced after rebase and histedit 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

simplify the error message shown when 'got rebase' has nothing to do

use POSIX [s1 = s2] syntax instead of [s1 == s2]; patch by Ryo ONODERA

implicitly mark all files in work tree as up-to-date after rebase/histedit This should always be correct, since rebase and histedit start out with a clean and single-base-commit worktree, and end up committing all changes across the entire work tree when they are successful. tested by jrick and myself

switch function declarations from Korn shell to Bourne/POSIX shell syntax ok stsp

add a -q option to tests for quiet output and use it for 'make regress' Previous default output remains when test cases are run individually. ok tracey

add a test for rebase file index corruption problem fix in previous commit ok tracey