Commits

Commit:
993e2a1b1ac61a9d56877df5325d519f7b737375
From:
Stefan Sperling <stsp@stsp.name>
Date:
handle symlink deletion and symlink conflicts during 'got update'
diff | patch | tree
Commit:
56d815a9328f873fd6818ac625999d06a8752a45
From:
Stefan Sperling <stsp@stsp.name>
Date:
We must null-terminate the result of readlink(3) in merge_symlink().
diff | patch | tree
Commit:
11cc08c1dfab6c56e9e4bd98ba204b5a7d56ea9e
From:
Stefan Sperling <stsp@stsp.name>
Date:
handle symlink conflicts by installing a file that contains conflict markers
diff | patch | tree
Commit:
526a746f455d1ff9cf184982a625225f5b0dd133
From:
Stefan Sperling <stsp@stsp.name>
Date:
handle newly added symlinks during 'got cherrypick'
diff | patch | tree
Commit:
5a1fbc73731cc22399d01ceb1290b4fd246efff2
From:
Stefan Sperling <stsp@stsp.name>
Date:
make it possible to fix "bad" symlinks with ln -sfh + got commit + got update
diff | patch | tree
Commit:
bd6aa3590530fb1684f2ca8ded49f431bf0e9a18
From:
Stefan Sperling <stsp@stsp.name>
Date:
convert bad symlinks to regular files during 'got commit'
diff | patch | tree
Commit:
3d9a4ec407702ad2b932c522001f1b88a36571de
From:
Stefan Sperling <stsp@stsp.name>
Date:
add symlink support to 'got commit'
diff | patch | tree
Commit:
af57b12ab516c7fa5ecc8bd00db5637240411ed7
From:
Stefan Sperling <stsp@stsp.name>
Date:
add symlink support to 'got cherrypick'; test non-conflict cases only for now
diff | patch | tree
Commit:
7d61d89137e4704e685dacfcfb71a42a87ba9f78
From:
Stefan Sperling <stsp@stsp.name>
Date:
fix checkout of symlinks when a relative work tree path is given
diff | patch | tree
Commit:
906c123b76844b1bba457451f3571b64afa77006
From:
Stefan Sperling <stsp@stsp.name>
Date:
do not allow symlinks pointing into the .got directory; noticed by semarie
diff | patch | tree
Commit:
b15bc87b1884e0d5a69df4536d29a8a8af8a745b
From:
Stefan Sperling <stsp@stsp.name>
Date:
fix memory leak in install_symlink() error path; spotted by semarie
diff | patch | tree
Commit:
ef68ca6f52da8c840d10d8c483c77fcac614c371
From:
Stefan Sperling <stsp@stsp.name>
Date:
add missing dirname(3) error check; found by semarie
diff | patch | tree
Commit:
a919d5c4ebaba5cf7b48888745d8b554acf6fe3e
From:
Stefan Sperling <stsp@stsp.name>
Date:
make 'got rm' work on symlinks; test case written by tracey
diff | patch | tree
Commit:
00bb5ea05eb54b4ec01ed195104765f7baf80169
From:
Stefan Sperling <stsp@stsp.name>
Date:
make 'got add' work on symlinks and let 'got status' display them
diff | patch | tree
Commit:
f35fa46a4c69eaeda5e106115e08b3cf8a0d3413
From:
Stefan Sperling <stsp@stsp.name>
Date:
add symlink support to 'got update'
diff | patch | tree
Commit:
0ab20ee9ead0bcdb626ef9fb52d63f58e13082a5
From:
Stefan Sperling <stsp@stsp.name>
Date:
fix handling of symlinks to a nonexistent target
diff | patch | tree
Commit:
8ba819a3547825c0e0d657a7e41610da16f6cd4f
From:
Stefan Sperling <stsp@stsp.name>
Date:
let 'got checkout' create symlinks in a work tree
diff | patch | tree
Commit:
3665fce011b5177f15b56dfc5d98f90e0ab59803
From:
Stefan Sperling <stsp@stsp.name>
Date:
display affected file path in ERR_FILE_OBSTRUCTED error messages
diff | patch | tree
Commit:
b737c85ae178a737ce5b50fc1967390d2c54292b
From:
Stefan Sperling <stsp@stsp.name>
Date:
fix endless loop introduced in 3143d852; programming is hard!
diff | patch | tree
Commit:
3143d852d788e42c45a61252acb935a698efed2f
From:
Stefan Sperling <stsp@stsp.name>
Date:
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
Commit:
054041d073d5af5bb32b7c3299af9cf2bf85c426
From:
Stefan Sperling <stsp@stsp.name>
Date:
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
Commit:
5a58a42470599ad46a3acd3fce47a6a1b7026a8b
From:
Stefan Sperling <stsp@stsp.name>
Date:
plug a memory leak in delete_blob()
diff | patch | tree
Commit:
5036ab18bf99be5d6811f17565b2c2fad47b3f73
From:
Stefan Sperling <stsp@stsp.name>
Date:
make 'got update' skip conflicted files ok millert@
diff | patch | tree
Commit:
678ade17323ba52d28ca9b2b58dfe8a232958363
From:
Stefan Sperling <stsp@stsp.name>
Date:
don't error out if rebase sees no merged paths; elide the commit instead
diff | patch | tree
Commit:
ba580f687cd7280a6d7bffb1693077693c486056
From:
Stefan Sperling <stsp@stsp.name>
Date:
prevent 'got commit' from comitting empty sub-directories; found by tracey
diff | patch | tree