Commit Briefs

b2b3fce13e Omar Polo

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@



8469d82143 Stefan Sperling

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@


49c543a6fe Christian Weisgerber

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.


10a623dfc2 Stefan Sperling

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@



f6cae3ed1e Christian Weisgerber

switch function declarations from Korn shell to Bourne/POSIX shell syntax

ok stsp


7fb414ae4d Stefan Sperling

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


cf0e59fe1a Stefan Sperling

fix wrong test result check in revert.sh symlink test



369fd7e5fa Stefan Sperling

add support for symlinks to 'got revert -p'


4901ccfcf0 Stefan Sperling

add a test for 'got revert' with symlinks


15341bfd54 Tracey Emery

trim directories in got remove -R

This is a racy solution that needs to be properly implemented in the future. ok stsp


a46b9f33fb Stefan Sperling

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.


fb9704afe0 Stefan Sperling

do not display unversioned files during 'got revert -R'



3d69ad8dfb Sebastien Marie

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


6c6b73bb41 Stefan Sperling

fix race condition in test_revert_patch_one_change



ce2b05c76c Stefan Sperling

test reverting the first hunk only with revert -p


33aa809d4f Stefan Sperling

implement 'revert -p'


0f6d741505 Stefan Sperling

implement got revert -R



a9fa2909b9 Stefan Sperling

fix 'got revert' on files in newly added subdirectories


e20a8b6f0d Stefan Sperling

allow multiple file path arguments for 'got revert'