Commit Briefs

Thomas Adam

switch 'tog diff' and 'tog blame' to Myers diff for speed

Make the choice of diff algorithm configurable by diff API users. The got and gotweb programs keep using Patience diffs which are prettier than Myers. But tog should be as fast as possible since it is being used interactively. If performance of Patience diff gets improved later we can consider switching tog back over to it. ok tracey jamsek


Thomas Adam

move more opentemp out of diffreg.c

ok tracey


Thomas Adam

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

ok tracey


Thomas Adam

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@


Thomas Adam

move creation of tempfiles outside of lib/diff.c

ok tracey


Thomas Adam

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

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



Stefan Sperling

merge new diff implementation from the git.gameoftrees.org diff.git repository

This new diff implementation was started by Neels Hofmeyr during the u2k20 hackathon and now replaces diffreg.c code lifted from the OpenBSD base system. The integration of this code into Got was done by me. Got now uses the patience diff algorithm by default. The diff.git repository will remain the primary repository for the diff code, which already compiles and runs on other operating systems such as Linux. Any fixes and improvements for files inherited from the diff.git repository should be written against that repository and synced to got.git afterwards.


Stefan Sperling

show a list of paths changed in a commit with 'got log -P', and in tog

requested by matthieu@







Stefan Sperling

whitespace formatting fixes in include/




Stefan Sperling

show commit timestamps in diff headers



Stefan Sperling

use a constant for max diff context size





Stefan Sperling

document the current public API


Stefan Sperling

add output file argument to got_diff_tree