Now that the handling of including sys/queue.h is better, there's no need to remove those lines from the source. Copy the location of those original sys/queue.h lines from upstream at the same line number, so as to avoid any conflicts in the future.

thanks for all the help massaging this diff

-portable doesn't need this directly.

Saves us from doing a malloc/free call for every item on the list. ok op@

Don't directly include sha1.h as this isn't always in the same location across systems.

Saves us from doing a malloc/free call for every item on the list. ok op@

The SHA implementation is found portably across systems, so don't include sha1.h directly.

Saves us from doing a malloc/free call for every item on the list. ok op@

Move the detection of UUID header files to be included portably. This will have no functional effect until MacOS detection is put in place.

suggested by millert ok thomas_adam

queue.h is included portably, so it shouldn't be included directly.

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