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

Additional testing by Thomas Adam. ok tracey

Performance problems reported by naddy

reported by + ok naddy

with insight I obtained while trying to make this idea work, and failing...

Fixes rebase of gotwebd branch which added a new directory which is also matched by .gitignore rules on the branch.

ok semarie@

The singly-linked tail queue macros were added to OpenBSD 6.9 and are more widely available on other systems. ok stsp

ok naddy

This has been shown to prevent mis-merges in some cases. It's probably not a final solution. We should look at what Git's "recursive merge" is doing and implement something similar. Keep using Myers during update/unstage. The advantage of Myers is that it produces smaller conflict chunks, and there are no known cases of mis-merges which affect update/unstage.

ok tracey

This was a long-standing and very annoying bug. The two xfail tests in the cherrypick test suite are passing now.