Commits
- Commit:
31cf15ecf83c7e0bf2e99599b19f43fe2435d75a
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make 'got revert' and 'got rm' work on non-existent directories
problem found by robert@
ok jamsek, op
- Commit:
885e96dfba200f362ddd1d9795740251bcb6e39b
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
regress: replace "sed -i" with ed(1) for portable in-place editing
"sed -i" is fundamentally unportable. GNU and OpenBSD sed(1) treat
the extension for the backup file as an optional argument and use
"sed -i" for no backup file. FreeBSD sed(1) treats the extension
as an obligatory argument and uses "sed -i ''" for no backup file.
There is no single syntax that works for both.
ok stsp op
- Commit:
f55db25a40103e9990a713a4f61d37686d786194
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
regress: replace unportable ln -h option with rm && ln
ok stsp
- 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:
c912cbbfaa9889cb87cebee87ff0df1f3c5db9fc
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
regress: adjust expected usage output in "revert_no_arguments" test
- Commit:
8469d82143a591d423c000c47c63bababe6f5716
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
always show commit or tree IDs in diff header, in order to help 'got patch'
The idea is that got patch can simply look for a line such as:
commit - abcde1234567...
to find the merge base commit ID to show in diff3 conflict markers.
got log -p now displays commit IDs in its diff header, instead ofl
tree or blob IDs.
ok op@
- 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:
10a623dfc23b47f494941e0eac741420c08372a3
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
sort and de-duplicate work tree path command line arguments
This is important in cases like 'got diff file.txt file.txt' which
should only show the diff for file.txt once.
suggested by kn@
- Commit:
54c39596938ae6d19fe5eede072d36a3f61baa12
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
use POSIX [s1 = s2] syntax instead of [s1 == s2]; patch by Ryo ONODERA
- 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:
cf0e59fe1a0f4e26a3cad1593337c6c93245fc02
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix wrong test result check in revert.sh symlink test
- Commit:
c2677d5d89614e1ee741e7db045977d219d097f9
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix missing return statements in revert.sh symlink test failure cases
- Commit:
369fd7e5fa99b95f7d7aa812b5260584b86a3778
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add support for symlinks to 'got revert -p'
- Commit:
4901ccfcf00b67f8336de482fe8950e35476998a
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add a test for 'got revert' with symlinks
- Commit:
15341bfd54bbabbe30297c358faf41ee05e247da
- From:
- Tracey Emery <tracey@traceyemery.net>
- Date:
trim directories in got remove -R
This is a racy solution that needs to be properly implemented in the future.
ok stsp
- Commit:
a46b9f33fb3018765180eb67cc954d863a5cd525
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix a bug where 'got revert -R' failed on added subtrees
The command could fail with "got: no such entry found in tree".
This problem is reproduced by the regression test added in this commit.
This happened because file index entries were processed in the wrong
order by diff_fileindex_dir(). To fix this, keep removed entries in
the RB tree and skip them when the file index is written out, rather
than removing entries from the RB tree immediately causing side-effects
for RB_NEXT and friends.
- Commit:
fb9704afe0e40de783660e26d5498278a47affca
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
do not display unversioned files during 'got revert -R'
- Commit:
6a5eff7c93868c5577c7d59c31aabc317824b34b
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
trim trailing whitespace in revert.sh (patch by Tracey Emery)
- Commit:
3d69ad8dfb2fedd8d5abee1365505c2479e00180
- From:
- Sebastien Marie <semarie@openbsd.org>
- Date:
make 'got revert' to ignore unversioned files instead of aborting with 'bad path'
and add a regress to check the revert isn't aborted anymore
- Commit:
6c6b73bb412843c96a7dca913c41a91827d9018c
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix race condition in test_revert_patch_one_change
- Commit:
f1e81a0517df837593350dd932e813563bdc01b8
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix bug where 'revert -p' would delete all lines following a reverted change
- Commit:
ce2b05c76c2655b619f516e32f44a54d0c8741db
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
test reverting the first hunk only with revert -p
- Commit:
33aa809d4fd2e43328dd3ad4897a7394c28c79ca
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
implement 'revert -p'
- Commit:
0f6d7415053c3cb56d6d4bafb624866ae4554f3e
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
implement got revert -R