Commit Briefs


Stefan Sperling

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@


Omar Polo

build with -Wmissing-prototypes

ok stsp@


Stefan Sperling

revert "clear the rest of the pack_fds pointers"

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



Tracey Emery

move got_opentempfd out of got_repo_open. ok stsp@

thanks for all the help massaging this diff



Stefan Sperling

make got log -s show committer date

ok op@


Stefan Sperling

make got log -s display local reference names

ok op@


Omar Polo

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@


Stefan Sperling

reuse a temporary file across commits during got log -p -S

suggested by + ok op@




Stefan Sperling

add one-line output mode to got log with -s flag

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


Stefan Sperling

move creation of tempfiles outside of lib/diff.c

ok tracey