Commit Briefs

2c41dce749 Stefan Sperling

allow obstructed files skipped by 'got update' to be updated again

diff | patch | tree

a769b60bb7 Stefan Sperling

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

ok semarie@

diff | patch | tree

1c4cdd8929 Stefan Sperling

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

ok naddy

diff | patch | tree

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.

diff | patch | tree

d51387a0c2 Stefan Sperling

expand coverage of test_update_single_file: test file deletion during update

diff | patch | tree

79775c2f00 Stefan Sperling

fix copy-pasta in test_update_single_file

diff | patch | tree

194cb7cb2a Stefan Sperling

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

Problem reported by Timo Myyrä

diff | patch | tree

54c3959693 Stefan Sperling

use POSIX [s1 = s2] syntax instead of [s1 == s2]; patch by Ryo ONODERA

diff | patch | tree

1cb46f007d Stefan Sperling

consistently label removed files as "/dev/null" in diff headers

diff | patch | tree

f6cae3ed1e Christian Weisgerber

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

ok stsp

diff | patch | tree

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

diff | patch | tree

b66cd6f325 Stefan Sperling

display more context info in "no such entry found in tree" error messages

diff | patch | tree

283102fc7e Stefan Sperling

remove the symlink conflict header feature; it causes noise for little benefit

diff | patch | tree

3b9f0f87ff Stefan Sperling

handle additional symlink conflicts and report skipping of unversioned files

diff | patch | tree

993e2a1b1a Stefan Sperling

handle symlink deletion and symlink conflicts during 'got update'

diff | patch | tree

f35fa46a4c Stefan Sperling

add symlink support to 'got update'

diff | patch | tree

e730362696 Stefan Sperling

add submodule tests

ok semarie

diff | patch | tree

9627c110be Stefan Sperling

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

ok millert@

diff | patch | tree

5036ab18bf Stefan Sperling

make 'got update' skip conflicted files

ok millert@

diff | patch | tree

f69721c3fc Stefan Sperling

show base commit hash and omit filenames in conflict markers

diff | patch | tree

523b8417c1 Stefan Sperling

handle xbit-only changes during 'got update'

diff | patch | tree

d136cfcb98 Stefan Sperling

show original file content in conflict markers

diff | patch | tree

2a06fe5f59 Stefan Sperling

indicate non-existent paths in 'got status' and make 'got diff' error for them

diff | patch | tree

303e2782e0 Stefan Sperling

add support for tags to -c options of some got commands

diff | patch | tree

305993b9d1 Stefan Sperling

fix typo in test commit log message

diff | patch | tree