Commit Briefs

Stefan Sperling

move got_opentempfd() out of lib/diff.c again

ok tracey



Omar Polo

build with -Wwrite-strings

Throwing this into the mix for a while, we can always get rid of it again if it becomes annoying. No objections from stsp@


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@


Stefan Sperling

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

suggested by + ok op@


Stefan Sperling

move creation of tempfiles outside of lib/diff.c

ok tracey


Stefan Sperling

sort paths in got log -Pp and tog's diff view the same way as in the diff

reported by and fix confirmed by naddy


Stefan Sperling

implement 'got diff -c' for diffing commits with optional filtering by path

Need for filtering by path sugggested by kn@ ok naddy@


Stefan Sperling

make fclose(3) failure checks consistent; check 'fclose() == EOF' everywhere

ok millert, naddy


Stefan Sperling

do not forget to add an offset for line zero in diff_blobs()

Fixes a problem in 'tog diff' where the first line of the output was cut off.





Stefan Sperling

remove stdbool.h where it's not needed