Commits

Commit:
67ba61612157092fbe0f8c4a02b60faf31967061
From:
Stefan Sperling <stsp@stsp.name>
Date:
leave work tree in a usable state after 'got rebase' fails path-prefix checks reported by naddy
diff | patch | tree
Commit:
49c543a6fe888394ca86e6399c706a9965486134
From:
Christian Weisgerber <naddy@mips.inka.de>
Date:
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.
diff | patch | tree
Commit:
3d42b2660156bfd71df40d11a996d7bf233ed2a4
From:
Josh Rickmar <jrick@zettaport.com>
Date:
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
diff | patch | tree
Commit:
41f061b2f459318f3738f59d7676efccc4beb344
From:
Stefan Sperling <stsp@stsp.name>
Date:
ignore unversioned files while aborting rebase, histedit, merge or operations ok jrick
diff | patch | tree
Commit:
1fa4907213af37d50029ee33b989867f41f0f124
From:
Stefan Sperling <stsp@stsp.name>
Date:
interrupt 'got rebase' upon missing/unversioned/not-deleted files
diff | patch | tree
Commit:
35ca1db76b33010a85a6d0e68e5d78d451028269
From:
Stefan Sperling <stsp@stsp.name>
Date:
print additional stats about things that went wrong during a merge
diff | patch | tree
Commit:
3a6b87604592c583079227ea995f50eb3ec74121
From:
Christian Weisgerber <naddy@mips.inka.de>
Date:
use the POSIX-compliant "date -u" command to return UTC time; ok stsp
diff | patch | tree
Commit:
a96621150027f46d946238e99c8236a06f79f0da
From:
Christian Weisgerber <naddy@mips.inka.de>
Date:
add missing "return 1" to failure handling in the regress scripts ok stsp@
diff | patch | tree
Commit:
993f033b6f1d781a4ba7970fec46915d08e53502
From:
Stefan Sperling <stsp@stsp.name>
Date:
make 'got ref -d' print reference name and value like the new -X options do
diff | patch | tree
Commit:
643b85bcb48e24fd2ca96d415d8e61e1ceef9aad
From:
Stefan Sperling <stsp@stsp.name>
Date:
new -X option for removing backups created by got rebase and got histedit ok semarie
diff | patch | tree
Commit:
54d5be07768d1e312078b5eb60f0e32738a1631a
From:
Stefan Sperling <stsp@stsp.name>
Date:
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.
diff | patch | tree
Commit:
9e822917b02cb36e8dd86a73a51ddfd57baa6c25
From:
Stefan Sperling <stsp@stsp.name>
Date:
rebase/histedit -l: error out if no backups for the requested branch exist
diff | patch | tree
Commit:
e600f1246e15fff13251ba9d299d74a24ae579c2
From:
Stefan Sperling <stsp@stsp.name>
Date:
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
diff | patch | tree
Commit:
df3ed485f4148d31d1b555abb99fcba42c1a49b7
From:
Stefan Sperling <stsp@stsp.name>
Date:
simplify the error message shown when 'got rebase' has nothing to do
diff | patch | tree
Commit:
54c39596938ae6d19fe5eede072d36a3f61baa12
From:
Stefan Sperling <stsp@stsp.name>
Date:
use POSIX [s1 = s2] syntax instead of [s1 == s2]; patch by Ryo ONODERA
diff | patch | tree