Commit Briefs

69d57f3de2 Stefan Sperling

fix spurious 'got cherrypick' error with a path prefix and an empty tree

If the work tree's path prefix does not exist in the first of the two trees, then 'got cherrypick' failed with "no such entry found in tree". But this is a legitimate situation, as shown in the new test added here. The first tree could be the empty tree, for example, which should result in 'got cherrypick' adding all files from the second tree instead of complaining about a non-existent path-prefix directory in the first tree.

diff | patch | tree

b66cd6f325 Stefan Sperling

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

diff | patch | tree

ff21961dc4 Tracey Emery

plug some parse.y leaks

diff | patch | tree

b2118c49a1 Stefan Sperling

Add a 'got info' command which displays work tree meta-data.

Remove the alias 'got in' for 'got init'. The 'in' alias was too close to either 'init' or 'info'. ok tracey, millert

diff | patch | tree

cf07f22bd8 Stefan Sperling

improve "got log ." command mark-up in got.1 EXAMPLES

diff | patch | tree

aa9ad2764a Stefan Sperling

fix use of uninitialized variable in got_fileindex_entry_update()

diff | patch | tree

af358f5538 Stefan Sperling

tweak description of new -S option for 'got commit' and 'got stage'

with input from + ok tracy and millert

diff | patch | tree

559d127ca5 Stefan Sperling

errant tab found by tracey

diff | patch | tree

4180658719 Stefan Sperling

fix missing 'return 1' in commit.sh test failure cases

diff | patch | tree

283102fc7e Stefan Sperling

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

diff | patch | tree

f9eec9d5cd Stefan Sperling

rename get_symlink_status() to get_symlink_modification_status() for clarity

diff | patch | tree

f179e66de4 Stefan Sperling

use a shortcut in get_file_status() for detecting symlinks appearing on disk

diff | patch | tree

fda8017d0d Stefan Sperling

move deeply indented code from unstage_path() to a new unstage_hunks() helper

diff | patch | tree

36bf999ca5 Stefan Sperling

make 'got unstage -p' work with symlinks

diff | patch | tree

aa09269211 Stefan Sperling

initialize output parameter of got_object_blob_read_to_str(); found by ofree

diff | patch | tree

cf0e59fe1a Stefan Sperling

fix wrong test result check in revert.sh symlink test

diff | patch | tree

c2677d5d89 Stefan Sperling

fix missing return statements in revert.sh symlink test failure cases

diff | patch | tree

dfe9fba067 Stefan Sperling

remove merge_blob() fallback from merge_symlink(); let callers handle this

diff | patch | tree

75f0a0fb34 Stefan Sperling

stop reinstalling symlinks after commit; 'got update' can handle that

diff | patch | tree

35213c7c83 Stefan Sperling

forbid bad symlinks; add -S option to 'got commit' and 'got stage' to allow them

diff | patch | tree

3c1ec782ab Stefan Sperling

put checks for bad symlink target paths into a dedicated function

diff | patch | tree

ea7786be38 Stefan Sperling

make 'got unstage' work with symlinks

diff | patch | tree

b7422a2f5c Stefan Sperling

stop using realpath(3) to resolve a symlink target in install_symlink()

We should not resolve a symlink target path recursively when installing a symlink in the work tree. We want to handle this symlink's target, not the end result of following a chain of symlinks in case such links already exist.

diff | patch | tree

369fd7e5fa Stefan Sperling

add support for symlinks to 'got revert -p'

diff | patch | tree

fa3cef6379 Stefan Sperling

make 'got stage -p' work with symlinks

diff | patch | tree