Commits

Commit:
283102fc7ecc50b874240654162793c0bd07a028
From:
Stefan Sperling <stsp@stsp.name>
Date:
remove the symlink conflict header feature; it causes noise for little benefit
diff | patch | tree
Commit:
f9eec9d5cdd0cbb22e0d3ed2d1cb55569afafce9
From:
Stefan Sperling <stsp@stsp.name>
Date:
rename get_symlink_status() to get_symlink_modification_status() for clarity
diff | patch | tree
Commit:
f179e66de44d3541fbbcf6be9a5bcc70465f0bc9
From:
Stefan Sperling <stsp@stsp.name>
Date:
use a shortcut in get_file_status() for detecting symlinks appearing on disk
diff | patch | tree
Commit:
fda8017d0d1d1314b68ea9776bb563c2ea127f3e
From:
Stefan Sperling <stsp@stsp.name>
Date:
move deeply indented code from unstage_path() to a new unstage_hunks() helper
diff | patch | tree
Commit:
36bf999ca5297d07cc17f79a154b0875c1574148
From:
Stefan Sperling <stsp@stsp.name>
Date:
make 'got unstage -p' work with symlinks
diff | patch | tree
Commit:
dfe9fba06700a32516eb465d89fe7e0b6d96ad2f
From:
Stefan Sperling <stsp@stsp.name>
Date:
remove merge_blob() fallback from merge_symlink(); let callers handle this
diff | patch | tree
Commit:
75f0a0fb346fb0ad381536024728164cd32d2a7e
From:
Stefan Sperling <stsp@stsp.name>
Date:
stop reinstalling symlinks after commit; 'got update' can handle that
diff | patch | tree
Commit:
35213c7c838a48142d398147b54bb9938af8cab0
From:
Stefan Sperling <stsp@stsp.name>
Date:
forbid bad symlinks; add -S option to 'got commit' and 'got stage' to allow them
diff | patch | tree
Commit:
3c1ec782ab68abf6084ad937bc2a3e4a9c8fe049
From:
Stefan Sperling <stsp@stsp.name>
Date:
put checks for bad symlink target paths into a dedicated function
diff | patch | tree
Commit:
ea7786be381853efad88beae518c19a391d13791
From:
Stefan Sperling <stsp@stsp.name>
Date:
make 'got unstage' work with symlinks
diff | patch | tree
Commit:
b7422a2f5c775615ff397e14c04aa9c9a41504c1
From:
Stefan Sperling <stsp@stsp.name>
Date:
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
Commit:
369fd7e5fa99b95f7d7aa812b5260584b86a3778
From:
Stefan Sperling <stsp@stsp.name>
Date:
add support for symlinks to 'got revert -p'
diff | patch | tree
Commit:
fa3cef63799016195e8a917f39c82815522692aa
From:
Stefan Sperling <stsp@stsp.name>
Date:
make 'got stage -p' work with symlinks
diff | patch | tree
Commit:
b448fd00850830156870881effc6cafd6233b8b6
From:
Stefan Sperling <stsp@stsp.name>
Date:
fix wrong function name in an error message
diff | patch | tree
Commit:
0aeb8099a04ea427eff4a7b6cb52b1cba62a87b0
From:
Stefan Sperling <stsp@stsp.name>
Date:
set a staged file type and handle it separately from the on-disk file type
diff | patch | tree
Commit:
c631b1152565e4c18cb2123e1d3d7c08d513c02f
From:
Stefan Sperling <stsp@stsp.name>
Date:
make staging of symlinks work
diff | patch | tree
Commit:
6131ab45b4ac2e03447e28d41d92c53ecfe632e3
From:
Stefan Sperling <stsp@stsp.name>
Date:
remove pointless error checking in got_fileindex_entry_filetype_set()
diff | patch | tree
Commit:
6e1eade5c833f34c20301fd61b720268525270f8
From:
Stefan Sperling <stsp@stsp.name>
Date:
fix 'got revert' progress output for symlinks
diff | patch | tree
Commit:
3b9f0f87ff620ce7d6ad75195b0c67425bc96ab7
From:
Stefan Sperling <stsp@stsp.name>
Date:
handle additional symlink conflicts and report skipping of unversioned files
diff | patch | tree
Commit:
c90c8ce30c933a907f591ebe599ed6b7506f8217
From:
Stefan Sperling <stsp@stsp.name>
Date:
preserve unversioned files when merging added symlinks
diff | patch | tree
Commit:
65b05cec5f251400ee165670853253a3629f4d28
From:
Stefan Sperling <stsp@stsp.name>
Date:
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
Commit:
2e1fa22206f9dbaca888c89bb9938782cbb4c5a1
From:
Stefan Sperling <stsp@stsp.name>
Date:
give bad symlinks a dedicated file type in the file index
diff | patch | tree
Commit:
b88d214a31981ae2610d930c34d956143b03c523
From:
Stefan Sperling <stsp@stsp.name>
Date:
use default file permissions when installing "bad" symlinks
diff | patch | tree
Commit:
960094b4eff0069984143900870f8486dbe0a08d
From:
Stefan Sperling <stsp@stsp.name>
Date:
resolve an XXX remark in merge_file_cb()
diff | patch | tree
Commit:
d219f183308acdda359bff4261e6ff7cd249670f
From:
Stefan Sperling <stsp@stsp.name>
Date:
test_cherrypick_symlink_conflicts forgot to run 'got add' on a file; fix this
diff | patch | tree