Commits


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.


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


plug some parse.y leaks


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


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


fix use of uninitialized variable in got_fileindex_entry_update()


tweak description of new -S option for 'got commit' and 'got stage' with input from + ok tracy and millert


errant tab found by tracey


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


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


rename get_symlink_status() to get_symlink_modification_status() for clarity


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


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


make 'got unstage -p' work with symlinks


initialize output parameter of got_object_blob_read_to_str(); found by ofree


fix wrong test result check in revert.sh symlink test


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


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


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


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


put checks for bad symlink target paths into a dedicated function


make 'got unstage' work with symlinks


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.


add support for symlinks to 'got revert -p'


make 'got stage -p' work with symlinks