Commit Briefs

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

Stefan Sperling

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

diff | patch | tree

Stefan Sperling

rename get_symlink_status() to get_symlink_modification_status() for clarity

diff | patch | tree

Stefan Sperling

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

diff | patch | tree

Stefan Sperling

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

diff | patch | tree

Stefan Sperling

make 'got unstage -p' work with symlinks

diff | patch | tree

Stefan Sperling

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

diff | patch | tree

Stefan Sperling

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

diff | patch | tree

Stefan Sperling

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

diff | patch | tree

Stefan Sperling

put checks for bad symlink target paths into a dedicated function

diff | patch | tree

Stefan Sperling

make 'got unstage' work with symlinks

diff | patch | tree

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

Stefan Sperling

add support for symlinks to 'got revert -p'

diff | patch | tree

Stefan Sperling

make 'got stage -p' work with symlinks

diff | patch | tree

Stefan Sperling

fix wrong function name in an error message

diff | patch | tree

Stefan Sperling

set a staged file type and handle it separately from the on-disk file type

diff | patch | tree

Stefan Sperling

make staging of symlinks work

diff | patch | tree

Stefan Sperling

remove pointless error checking in got_fileindex_entry_filetype_set()

diff | patch | tree

Stefan Sperling

fix 'got revert' progress output for symlinks

diff | patch | tree

Stefan Sperling

handle additional symlink conflicts and report skipping of unversioned files

diff | patch | tree

Stefan Sperling

preserve unversioned files when merging added symlinks

diff | patch | tree

Stefan Sperling

add an output argument to create_fileindex_entry()

Avoids a pointless search of the file index in the case the caller needs to use the newly created file entry.

diff | patch | tree

Stefan Sperling

give bad symlinks a dedicated file type in the file index

diff | patch | tree

Stefan Sperling

use default file permissions when installing "bad" symlinks

diff | patch | tree

Stefan Sperling

resolve an XXX remark in merge_file_cb()

diff | patch | tree