Commit Briefs

56d815a932 Stefan Sperling

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

diff | patch | tree

11cc08c1df Stefan Sperling

handle symlink conflicts by installing a file that contains conflict markers

diff | patch | tree

526a746f45 Stefan Sperling

handle newly added symlinks during 'got cherrypick'

diff | patch | tree

5a1fbc7373 Stefan Sperling

make it possible to fix "bad" symlinks with ln -sfh + got commit + got update

diff | patch | tree

bd6aa35905 Stefan Sperling

convert bad symlinks to regular files during 'got commit'

diff | patch | tree

3d9a4ec407 Stefan Sperling

add symlink support to 'got commit'

diff | patch | tree

af57b12ab5 Stefan Sperling

add symlink support to 'got cherrypick'; test non-conflict cases only for now

diff | patch | tree

7d61d89137 Stefan Sperling

fix checkout of symlinks when a relative work tree path is given

diff | patch | tree

906c123b76 Stefan Sperling

do not allow symlinks pointing into the .got directory; noticed by semarie

diff | patch | tree

b15bc87b18 Stefan Sperling

fix memory leak in install_symlink() error path; spotted by semarie

diff | patch | tree

ef68ca6f52 Stefan Sperling

add missing dirname(3) error check; found by semarie

diff | patch | tree

a919d5c4eb Stefan Sperling

make 'got rm' work on symlinks; test case written by tracey

diff | patch | tree

00bb5ea05e Stefan Sperling

make 'got add' work on symlinks and let 'got status' display them

diff | patch | tree

f35fa46a4c Stefan Sperling

add symlink support to 'got update'

diff | patch | tree

0ab20ee9ea Stefan Sperling

fix handling of symlinks to a nonexistent target

diff | patch | tree

8ba819a354 Stefan Sperling

let 'got checkout' create symlinks in a work tree

diff | patch | tree

3665fce011 Stefan Sperling

display affected file path in ERR_FILE_OBSTRUCTED error messages

diff | patch | tree

b737c85ae1 Stefan Sperling

fix endless loop introduced in 3143d852; programming is hard!

diff | patch | tree

3143d852d7 Stefan Sperling

fix ignores when a path is passed to 'got status'

Problem reported by semarie, who also provided initial regression test code. ok semarie

diff | patch | tree

054041d073 Stefan Sperling

replace the update_blob_fileindex_entry() helper function

This makes it easier to tell in which code paths we are expecting to handle a potential 'ie' NULL pointer and avoids a pointless search of the file index.

diff | patch | tree

5a58a42470 Stefan Sperling

plug a memory leak in delete_blob()

diff | patch | tree

5036ab18bf Stefan Sperling

make 'got update' skip conflicted files

ok millert@

diff | patch | tree

678ade1732 Stefan Sperling

don't error out if rebase sees no merged paths; elide the commit instead

diff | patch | tree

ba580f687c Stefan Sperling

prevent 'got commit' from comitting empty sub-directories; found by tracey

diff | patch | tree

3969253a05 Stefan Sperling

remove implicit entry update from got_fileindex_entry_alloc(); just alloc

diff | patch | tree