Commits

Commit:
984c073dfee89f661d050e8a4fd10fc0e858af7d
From:
Stefan Sperling <stsp@stsp.name>
Date:
add getter/setter for staged file index entry filetype
diff | patch | tree
Commit:
f5f1f9c21f2e0723f0a8178f620b7f43724e6b60
From:
Stefan Sperling <stsp@stsp.name>
Date:
handle on-disk file index entry filetypes properly
diff | patch | tree
Commit:
1e0a3718b1131a9aac753d87c863ef437f73eabc
From:
Stefan Sperling <stsp@stsp.name>
Date:
reserve some file entry mode bits for a staged file type
diff | patch | tree
Commit:
4901ccfcf00b67f8336de482fe8950e35476998a
From:
Stefan Sperling <stsp@stsp.name>
Date:
add a test for 'got revert' with symlinks
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:
ef8d60312a7ca5c60477010ceec1137e05985a2e
From:
Stefan Sperling <stsp@stsp.name>
Date:
keep file index entry permission bits clear for symlinks
diff | patch | tree
Commit:
fba9f79c4f8a59659511cef89c1fca8809a5dce4
From:
Stefan Sperling <stsp@stsp.name>
Date:
restore unversioned file test case in test_cherrypick_symlink_conflicts One part of current behaviour is to delete an unversioned file and replace it with a symlink; that's very bad in case the user wants to keep the file.
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
Commit:
88fb31d4fff7b0b2d49de132675aa871955ae6c4
From:
Stefan Sperling <stsp@stsp.name>
Date:
extend test_commit_symlink test case
diff | patch | tree
Commit:
e8863bdcc347433dd57e74d456115a6cb5d9953c
From:
Stefan Sperling <stsp@stsp.name>
Date:
add symlink support to 'got import'
diff | patch | tree
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:
e26bafba995edab19824ed3ed6d81535259b39f1
From:
Stefan Sperling <stsp@stsp.name>
Date:
add cherrypick test for symlink conflict cases This test accepts the current behaviour, even though the current behaviour isn't ideal in some cases.
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:
75c3042749cebcb49930b762aa6b635efbb72970
From:
Stefan Sperling <stsp@stsp.name>
Date:
remove debugging test code
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:
2f63b34ce3d2db78052d19284337414845664b6f
From:
Stefan Sperling <stsp@stsp.name>
Date:
restore 8k buffer size for hashing file contents in got_object_blob_create()
diff | patch | tree