The idea is that got patch can simply look for a line such as: commit - abcde1234567... to find the merge base commit ID to show in diff3 conflict markers. got log -p now displays commit IDs in its diff header, instead ofl tree or blob IDs. ok op@

ok stsp@

There is no need to clear local variables before returning from a function. ok tracey

thanks for all the help massaging this diff

ok op@

ok op@

So that 'got log -S' can match also the author and committer name, and the commit ID too. ok stsp@

suggested by + ok op@

ok op@

-s for short. Moves log search to -S. Patch by Evan Silberman

ok tracey

-portable doesn't need this directly.

This prepares for callers of got_repo_open() that cannot afford to open files in /tmp, such as gotwebd. In a follow-up change, we could ask such callers to pass in the required amount of open temporary files. One consequence is that got_repo_open() now requires the "cpath" pledge promise. Add the "cpath" promise to affected callers and remove it once the repository has been opened. ok tracey

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@

add a flag to got_patch to reverse a patch before applying and the -R flag for `got patch'. ok stsp@

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@