Commits
- Commit:
f1c9fe20d35f9b64cee89491805039b13c91c8de
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
got: add 'got histedit -d' flag to drop all commits
Like -f, except drop all commits. Discussed with op and stsp on irc.
ok stsp@
- Commit:
71a61c8ccc19248c397974fbd63b952d2665771c
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
use VISUAL instead of EDITOR in histedit_mesg_filemode_change
VISUAL is preferred and relying on EDITOR may cause test
failures in some environments.
pointed out by op and jamsek
- Commit:
9f31ca1f0edf2d4791f35577d55fc5775fff871b
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
simplify file content comparison in a regress test; suggested by op@
- Commit:
c48f94a406682029fa132ede24321b2622641970
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix histedit -m on a commit which only changes filemode bits
The commit was being miscategorized as a no-op change and dropped.
Now the commit is retained and its log message is updated as expected.
ok op, jamsek
- Commit:
5f94a4e005d31b60559a66dd5fa48b0ed7348d83
- From:
- Omar Polo <op@omarpolo.com>
- Date:
regress: consistently use ed -s
didn't know about -s when writing those tests; saves some output
redirection.
ok jamsek
- 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.