Commit Briefs

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

Stefan Sperling

test_cherrypick_symlink_conflicts forgot to run 'got add' on a file; fix this

diff | patch | tree

Stefan Sperling

handle symlink deletion and symlink conflicts during 'got update'

diff | patch | tree

Stefan Sperling

We must null-terminate the result of readlink(3) in merge_symlink().

diff | patch | tree

Stefan Sperling

handle symlink conflicts by installing a file that contains conflict markers

diff | patch | tree

Stefan Sperling

handle newly added symlinks during 'got cherrypick'

diff | patch | tree