| commit | 0c8b20c694a225aa33da5d4b532237b6e1c37f43 | |
| author | Stefan Sperling <stsp@stsp.name> | |
| Sun, 26 Sep 2021 11:41:40 +0000 (26 11:41 +0000) | ||
| committer | Thomas Adam <thomas@xteddy.org> | |
| Sun, 17 Oct 2021 15:43:21 +0000 (17 16:43 +0100) | ||
| tree | 051840326364e0a455d94a5997d608ab89d9fe30 | treesnapshot (tar.gz zip) |
| parent | f8bb1d3e37228297e32b153935f816b3141abd87 | commitdiff |
allow bad symlinks to survive a merge
Commands which perform merges will now install bad symlinks as symlinks
in the work tree, instead of creating them as regular files. This means
bad symlinks committed with 'got commit -S' (or Git) will be preserved.
The decision to introduce a bad symlink is done at commit-time and
merges should not forcefully reverse this decision.
The cherrypick and backout commands require a manual commit step, and
a merge result with bad symlinks will require use of 'got commit -S'.
Additional testing by thomas adam
Commands which perform merges will now install bad symlinks as symlinks
in the work tree, instead of creating them as regular files. This means
bad symlinks committed with 'got commit -S' (or Git) will be preserved.
The decision to introduce a bad symlink is done at commit-time and
merges should not forcefully reverse this decision.
The cherrypick and backout commands require a manual commit step, and
a merge result with bad symlinks will require use of 'got commit -S'.
Additional testing by thomas adam