pull in a type fix from the OpenBSD parse.y template Original commit message by deraadt: (unsigned) means (unsigned int) which on ptrdiff_t or size_t or other larger types really is a range reduction... Almost any cast to (unsigned) is a bug.

fix unsigned/signed char mismatch in parse.y

update a CAVEAT in got.1 now that 'got merge' exists

interrupt 'got histedit' upon missing/unversioned/not-deleted files

interrupt 'got rebase' upon missing/unversioned/not-deleted files

document all reasons why 'got merge' might be interrupted

make 'got merge' interrupt the merge upon undeleted and unversioned files

print additional stats about things that went wrong during a merge

fix 'got fetch' downloading too many objects in some cases Always announce all local references to the server when fetching changes. We used to do this only in mirror mode. In regular mode only refs/tags and refs/remotes/origin were announced, which could result in unnecessary downloads if relevant objects exist in refs/heads or elsewhere.

got_sha1_digest_to_str() writes to char * ok stsp

fix unsigned/signed char mismatch in parse.y ok stsp

match the unsigned char type used by the zlib interface ok stsp

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@

garbage-collect unused "dist" target from subdirectory Makefiles ok stsp

implement 'got merge -n' which interrupts before creating a merge commit

make it possible to merge vendor branches with 'got merge'

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

match printf specifiers and (cast) types for portability ok stsp

whitespace fix from Omar Polo

fix some integers that had a slightly wrong type; patch by Omar Polo

add 'static' qualifier to local functions in got-read-pack; patch by Omar Polo

mark some function parameters as 'const', as they should be; patch by Omar Polo

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

stop using the term 'obstructed' ambiguously in the got.1 man page Specifically, obstructed files are versioned files which should be on disk but have been replaced on disk by a non-regular file (e.g. by a directory). The man page used the phrase "deletion was obstructed" which is unrelated to the above concept and can be expressed as "deletion was prevented" instead.