Commit Briefs


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.


0e03968138 Stefan Sperling

preverse binary files during updates and merges


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@


f6764181d7 Stefan Sperling

fix 'got update' of an added + obstructed file

When 'got update' tried to add a new file to the work tree and this file was obstructed by, say, a directory on disk, the update failed: $ got update ? new got: new: Is a directory $ And the work tree was not updated. With this commit this situation is properly detected as an obstruction and the update succeeds: $ got update ~ new Updated to refs/heads/master: c1f85b4938dc4c668a88f13df2b98a520fc077cc File paths obstructed by a non-regular file: 1 $ Extend a corresponding test case to cover this issue. ok tracey


4f3c844bea Stefan Sperling

make 'got update' display the worktree's branch name upon success

ok tracey




a769b60bb7 Stefan Sperling

fix a bug where files skipped by 'got update' could not be updated again

ok semarie@


1c4cdd8929 Stefan Sperling

fix bogus 'permission denied' error when a file at work tree root is removed

ok naddy


c6e8a8268e Stefan Sperling

do not update symlinks which are already up-to-date

This fixes spurious 'U' notifications for symlinks during 'got update' that occurred even when the work tree was fully up-to-date. Observed on a work tree of the FreeBSD src repo and reproduced in our test suite by adding a no-op update at the end of a test which deals with updating symlinks.



79775c2f00 Stefan Sperling

fix copy-pasta in test_update_single_file


194cb7cb2a Stefan Sperling

fix bug where 'got up -c commit path' deleted unrelated files from work tree

Problem reported by Timo Myyrä




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






f35fa46a4c Stefan Sperling

add symlink support to 'got update'


e730362696 Stefan Sperling

add submodule tests

ok semarie


9627c110be Stefan Sperling

show a summary of conflicts and related problems after updating/merging files

ok millert@