Commits
- Commit:
c0df59665de91324eeab1808c6c4e41343f21789- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
wrap overlong lines
- Commit:
e7ae0bafeffce6697bc3b67fda753e5bac995cb6- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add O_CLOEXEC (close-on-exec) to openat(2) calls
suggested by millert
ok thomas_adam
- Commit:
8bd0cdad05519cbb08d8d11223bdde0472678150- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add O_CLOEXEC (close-on-exec) flag to open(2) calls
suggested by millert
ok thomas_adam
- Commit:
00fe21f262ab567bb792120514b49b37236c5422- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add "e" (close-on-exec) flag to fopen(3) calls
suggested by millert
ok thomas_adam
- Commit:
0e039681388d7ec1f832edcbb108ac28db95ae1e- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
preverse binary files during updates and merges
- Commit:
7d69d862a07866680ea64fcf8c30500f1f510243- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
let gotadmin find the repository automatically if invoked in a work tree
Move a small amount of code from worktree.c to a new file worktree_open.c,
which contains everything required to open and close a work tree and inspect
some of its basic parameters. This can be used by gotadmin.
ok tracey
- Commit:
62da3196627c41ea9acc5f53e0da9887dca2b82d- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
skip ignored directories during 'got status' disk crawl
- Commit:
0ff8d236625b5d8329e10e9b812cbdef76917ba6- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
show commit progress output when 'got merge -c' is used
Otherwise no progress output is shown at all with this command.
Commit progress output will also display any additional changes
which resulted from conflict resolution.
ok millert@
- Commit:
5c02d2a555dc01ac06db5a47b8c81adf2bf3f8a6- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
for portability, handle errno variations upon open(2) failure with O_NOFOLLOW
Problem pointed out by naddy for FreeBSD -portable.
Discussed with millert, thomas adam, and naddy.
- Commit:
5267b9e4960076d7de62633b9f5f1dcdb6594b33- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
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
- Commit:
f6764181d7e0fc68673b90cbc93d6064509d0bd7- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix 'got update' of an added + obstructed file
When 'got update' tried to add a new file to the work tree and this
file was obstructed by, say, a directory on disk, the update failed:
$ got update
? new
got: new: Is a directory
$
And the work tree was not updated.
With this commit this situation is properly detected as an obstruction
and the update succeeds:
$ got update
~ new
Updated to refs/heads/master: c1f85b4938dc4c668a88f13df2b98a520fc077cc
File paths obstructed by a non-regular file: 1
$
Extend a corresponding test case to cover this issue.
ok tracey
- Commit:
793fcac3d46049fc9505ccf53b23af592bfdb963- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
plug memory leak in got_worktree_merge_in_progress(); spotted by tracey
- Commit:
f259c4c18277237ced1043033cb1af739f73db28- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add a 'got merge' command for creating merge commits
Additional testing by Thomas Adam.
ok tracey
- Commit:
abc59930d57a2d46c310e1b0c758c948554bc1af- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
indentation fixes
- Commit:
69de9dd4215502c97f3e9b6c95cd1ce609fba278- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
limit checks for merge conflicts to files affected by the merge
Performance problems reported by naddy