Commits
- Commit:
b2b3fce13e4eca588bb28a869b07f0063568b505
- From:
- Omar Polo <op@omarpolo.com>
- Date:
respect umask when creating or changing files and directories
This behaviour is already documented in got-worktree(5) but wasn't
actually implemented.
ok stsp@
- Commit:
598eac4331d322ab9e91ee6864c54845e3a6e86c
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
reset committer during rebase and histedit
ok op@
- Commit:
97f28afb9820967508ab57f5ed6a5c75f49464b4
- From:
- Omar Polo <op@omarpolo.com>
- Date:
regress: add missing return in error path
- Commit:
f1e5aff40c5f42ab6fd83a2fb41ca0d10b3b21c9
- From:
- Omar Polo <op@omarpolo.com>
- Date:
histedit: make sure mesg is only used after pick or edit
It doesn't really make sense to use mesg after a fold or drop, or after
another mesg. it currently "works" as intended, but the behaviour is
confusing and not useful, better abort the operation as it's probably
not what the user intended.
Suggested by and ok stsp@
- 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.
- Commit:
b4e0802fabd9a36f320a70b8aa668a66533cfb08
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
FreeBSD's ed(1) does not accept "0i"; use the equivalent "1i" instead
- Commit:
09209b8a13411e9d8464267c5e65c2c848455496
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add test for merge result when lines are inserted at the top of a file
Based on a patch by Omar Polo
- Commit:
41f061b2f459318f3738f59d7676efccc4beb344
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
ignore unversioned files while aborting rebase, histedit, merge or operations
ok jrick
- Commit:
b93c7142c142ac5699accd8dd259187a22e200fb
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add histedit -e option which runs the 'edit' script command for every commit
ok jrick
- Commit:
ad324bf53a11587dc227a2c00b65020595aa18dc
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix histedit_no_op test which was failing randomly
A no-op replayed history ends up having exactly the same commit IDs
if all commits are created at roughly the same moment in time.
There are no content changes involved so if commit timestamps do not
differ then commit hashes will be the same. In which case there is no
fork in history for 'got histedit -l' to display, yet the test was
always expecting a fork in history to be displayed.
Update the test to take this issue into account. The test will now pass
no matter which result is produced by the histedit operation.
Problem found by Lucas who observed that this test was randomly failing.
Patch also provided by Lucas.
- Commit:
4c662b1dc9113e3f0bbf38b33e085977f6452e27
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix test data directory name used by test_histedit_fold_add_delete
- 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:
643b85bcb48e24fd2ca96d415d8e61e1ceef9aad
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
new -X option for removing backups created by got rebase and got histedit
ok semarie
- 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