stop relying on commit cache for good performance of got_object_id_by_path() Instead of internally opening and closing the same commit object over and over again, require callers to pass an open commit object in. Avoids an inherent dependency on the commit object cache for reasonable performance. ok op@

move got_patch file status checking in worktree.c check_file_status used got_worktree_status to check if the file was in an allowed state, but it's wrong since the callback is not invoked on unchanged files. While here also fix a relate bug: unlink(newpath) is in the wrong spot and ends up removing files even when it shouldn't, so move it early in the got_worktree_schedule_* error handling. Finally, update the appropriate test case. It was passing before because got_worktree_schedule_add returned GOT_ERR_FILE_STATUS, not because check_file_status failed. ok stsp@

fix 'got status' with an obstructed file given as argument; found by Omar

fix 'got diff' on files which match an ignore pattern; found by Omar Polo

improve 'got add' error message if file does not exist; reported by Timo Myyrä ok tracey

make 'got rm' report an "unexpected status" error for unversioned files ok millert@

make 'got rm' behave like rm(1) for paths found missing on disk ok millert@

remove non-reachable 'return NULL' statement from report_single_file_status()

compress delta data from delta_cache directly into pack file

wrap overlong lines

add O_CLOEXEC (close-on-exec) to openat(2) calls suggested by millert ok thomas_adam

add O_CLOEXEC (close-on-exec) flag to open(2) calls suggested by millert ok thomas_adam

add "e" (close-on-exec) flag to fopen(3) calls suggested by millert ok thomas_adam

preverse binary files during updates and merges

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

skip ignored directories during 'got status' disk crawl

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@

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.

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

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

plug memory leak in got_worktree_merge_in_progress(); spotted by tracey

add a 'got merge' command for creating merge commits Additional testing by Thomas Adam. ok tracey

indentation fixes

limit checks for merge conflicts to files affected by the merge Performance problems reported by naddy

plug a memory leak in check_merge_ok()