Commit Briefs

Thomas Adam

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

diff | patch | tree

Thomas Adam

regress: fix test failures using ln(1)

GNU ln uses -T instead of -h for no-target-directory. OK thomas.adam

diff | patch | tree

Stefan Sperling

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

ok tracey

diff | patch | tree

Tracey Emery

add tests for checkout -q, update -q, and status -S. ok stsp

diff | patch | tree

Stefan Sperling

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

diff | patch | tree

Stefan Sperling

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

ok semarie@

diff | patch | tree

Stefan Sperling

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

ok naddy

diff | patch | tree

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

Stefan Sperling

expand coverage of test_update_single_file: test file deletion during update

diff | patch | tree

Stefan Sperling

fix copy-pasta in test_update_single_file

diff | patch | tree

Stefan Sperling

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

Problem reported by Timo Myyrä

diff | patch | tree

Stefan Sperling

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

diff | patch | tree

Stefan Sperling

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

diff | patch | tree

Christian Weisgerber

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

ok stsp

diff | patch | tree

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

Stefan Sperling

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

diff | patch | tree

Stefan Sperling

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

diff | patch | tree

Stefan Sperling

handle additional symlink conflicts and report skipping of unversioned files

diff | patch | tree

Stefan Sperling

handle symlink deletion and symlink conflicts during 'got update'

diff | patch | tree

Stefan Sperling

add symlink support to 'got update'

diff | patch | tree

Stefan Sperling

add submodule tests

ok semarie

diff | patch | tree

Stefan Sperling

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

ok millert@

diff | patch | tree

Stefan Sperling

make 'got update' skip conflicted files

ok millert@

diff | patch | tree

Stefan Sperling

show base commit hash and omit filenames in conflict markers

diff | patch | tree

Stefan Sperling

handle xbit-only changes during 'got update'

diff | patch | tree