Commits
- Commit:
d52bac284bc87b2e54ff8afd22886a7260f68b26- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
ignore unversioned files while aborting rebase, histedit, merge or operations
ok jrick
- Commit:
bb494413b7b04767e20fc5a04378d517cda008ad- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
interrupt 'got rebase' upon missing/unversioned/not-deleted files
- Commit:
0ef688596bd8c81c1cf6abdee7aedc07e1cbcbbc- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
print additional stats about things that went wrong during a merge
- Commit:
180f111d564b657f44e4182cd43fcfbdd40096bc- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas.adam@smoothwall.net>
- Date:
regress: fix test failures using date(1)
This patch fixes test failures related the date(1) utility.
In the long term we could add a wrapper function to detect valid options
for date(1) and use the variant which works on the current OS.
For now, this makes some tests pass and shows us where the problems are.
OK thomas.adam
- Commit:
3a6b87604592c583079227ea995f50eb3ec74121- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
use the POSIX-compliant "date -u" command to return UTC time; ok stsp
- Commit:
a96621150027f46d946238e99c8236a06f79f0da- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
add missing "return 1" to failure handling in the regress scripts
ok stsp@
- Commit:
993f033b6f1d781a4ba7970fec46915d08e53502- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make 'got ref -d' print reference name and value like the new -X options do
- Commit:
643b85bcb48e24fd2ca96d415d8e61e1ceef9aad- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
new -X option for removing backups created by got rebase and got histedit
ok semarie
- 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.
- Commit:
9e822917b02cb36e8dd86a73a51ddfd57baa6c25- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
rebase/histedit -l: error out if no backups for the requested branch exist
- 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
- Commit:
df3ed485f4148d31d1b555abb99fcba42c1a49b7- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
simplify the error message shown when 'got rebase' has nothing to do
- Commit:
54c39596938ae6d19fe5eede072d36a3f61baa12- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
use POSIX [s1 = s2] syntax instead of [s1 == s2]; patch by Ryo ONODERA
- Commit:
a615e0e7796ea1103a6e0d4b5dbb613459788666- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
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
- Commit:
f6cae3ed1ef0c22150181eeebb8f9e97db99dc5a- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
switch function declarations from Korn shell to Bourne/POSIX shell syntax
ok stsp
- Commit:
7fb414ae4d46ebdaeff458477ba801f9ad5853c4- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
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
- Commit:
70551d57b9f537ed14de697c1d7c552d26c12e5a- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add a test for rebase file index corruption problem fix in previous commit
ok tracey
- Commit:
9627c110bee81b5d7368441eaf4e661010ba9cd5- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
show a summary of conflicts and related problems after updating/merging files
ok millert@
- Commit:
a740a1b3a79d96ad7bbb80e74148e5396e81ee43- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
use 'got commit' in test_rebase_delete_missing_file instead of Git
- Commit:
ca6da77d8aee06c8367716562165d1a2f824faf8- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add a test for 'got rebase' to check behaviour on delete vs. delete
- Commit:
e31abbf21f99a7312bdfd392f33ace285feadfe5- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add -c option to 'got ref' which now expects just one argument after options
- Commit:
a0ea4fc07b81c69fa0409a2e39e702659f256179- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
show merged commit ID + logmsg upon merge conflict during rebase and histedit
This makes it more apparent which commit contained the conflicting change.
The new output looks like this:
C sys/dev/pci/if_iwm.c
8a98d848a1a5 -> merge conflict: properly modify station queues
got: conflicts must be resolved before rebasing can continue
- Commit:
da76fce2dfde1786444285db2a03ddf14328c662- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
let 'got branch' switch and update the work tree
ok tracey
- Commit:
1ae0a34120856e195295615ab4aa5493dfa95b2a- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add a test which ensures that 'got rebase' trims empty dirs from disk
- Commit:
5aa813935b6489921083da5ed9459a1cfb8a03e3- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add copyright year for files already touched in 2020