Commit Briefs


Stefan Sperling

do not require local author info during 'got rebase'

My commit to reset committer info during rebase was too strict in some use cases. Even when simply forwarding a branch the rebase operation could now fail if GOT_AUTHOR is not set. To fix this, fall back on existing commiter information if no author is configured. And try to obtain author info from Git config in case GOT_AUTHOR is not set. Problems reported by Mikhail.


Stefan Sperling

reset committer during rebase and histedit

ok op@



Florian Obser

path_got is unused and never assigned, no need to free it

OK stsp


Florian Obser

Do not ignore I/O errors.

Found by llvm's scan-build (dead store). OK stsp


Stefan Sperling

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


Stefan Sperling

move more opentemp out of diffreg.c

ok tracey


Stefan Sperling

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

ok tracey



Omar Polo

build with -Wmissing-prototypes

ok stsp@


Omar Polo

got stage: implicitly unstage when staging the reverse of the staged diff

otherwise we end up with a staged empty edit for that file. ok stsp@


Stefan Sperling

move creation of tempfiles outside of lib/diff.c

ok tracey


Omar Polo

refactor got_patch / got_worktree_patch_complete

let got_patch own fileindex_path and call got_worktree_patch_complete only if got_wokrtree_patch_prepare hasn't failed. suggested by stsp@


Omar Polo

got patch: avoid open/sync/close the fileindex over and over again

Instead of flushing the fileindex after every patch in the patchfile just reuse the same fileindex and sync it only at the end of the patch operation. This speeds up 'got patch' on large repositories by quite a lot.