Commit Briefs
always show commit or tree IDs in diff header, in order to help 'got patch'
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@
build with -Wmissing-prototypes
ok stsp@
revert "clear the rest of the pack_fds pointers"
There is no need to clear local variables before returning from a function. ok tracey
move got_opentempfd out of got_repo_open. ok stsp@
thanks for all the help massaging this diff
got log: sync match_commit from tog
So that 'got log -S' can match also the author and committer name, and the commit ID too. ok stsp@
reuse a temporary file across commits during got log -p -S
suggested by + ok op@
add one-line output mode to got log with -s flag
-s for short. Moves log search to -S. Patch by Evan Silberman
portable: fix-up sha1.h include
-portable doesn't need this directly.
open temporary files needed for delta application in got_repo_open()
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
inline struct got_object_id in struct got_object_qid
Saves us from doing a malloc/free call for every item on the list. ok op@
portable: include sha1.h portably
Don't directly include sha1.h as this isn't always in the same location across systems.
inline struct got_object_id in struct got_object_qid
Saves us from doing a malloc/free call for every item on the list. ok op@
got patch: allow to reverse a patch
add a flag to got_patch to reverse a patch before applying and the -R flag for `got patch'. ok stsp@
portable: freebsd: portably include sha1
The SHA implementation is found portably across systems, so don't include sha1.h directly.
inline struct got_object_id in struct got_object_qid
Saves us from doing a malloc/free call for every item on the list. ok op@