Commit Briefs

Mark Jamsek

typo: pass rejectfile--not outfile--to got_ferror()

ok stsp@

diff | patch | tree

Mark Jamsek

got: minor refactor of got_pathlist_free() API

Accept flag parameter to optionally specify which pointers to free. This saves callers looping through the list to free pointers. ok + fix stsp@

diff | patch | tree

Mark Jamsek

got: expand diffstat -d option to 'got diff'

Like got log -d, add the switch to 'got diff' to display a diffstat of changes; as per stsp's suggestion, we always include diff output with the diffstat. Disabled in gotwebd (for now :) Includes tweaks from op@ ok stsp@

diff | patch | tree

Stefan Sperling

do not hint at empty temporary diff files in the log message buffer

ok op@

diff | patch | tree

Stefan Sperling

ensure that files are in a state where a diff can be created, before diffing

ok op@

diff | patch | tree

Stefan Sperling

use a global flag instead of a per-file flag to detect staged changes

ok op@

diff | patch | tree

Stefan Sperling

use mkstemps(3) instead of mkstemp(3) for opening named temporary files

Allows 'got commit' to use a ".diff" suffix for temporary diff files. ok op@

diff | patch | tree

Stefan Sperling

provide a diff of changes in a temp file while editing a commit log message

ok landry@

diff | patch | tree

Omar Polo

respect umask when creating or changing files and directories

This behaviour is already documented in got-worktree(5) but wasn't actually implemented. ok stsp@

diff | patch | tree

Stefan Sperling

check for unlink(2) errors with the == -1 idiom, rather than != 0

ok op@

diff | patch | tree

Stefan Hagen

got: don't search through ignored paths and files on commit

diff | patch | tree

Stefan Sperling

remove trailing whitespace; patch by Josiah Frentsos

diff | patch | tree

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.

diff | patch | tree

Stefan Sperling

reset committer during rebase and histedit

ok op@

diff | patch | tree

Stefan Sperling

call time(3) just once in commit_worktree(), not twice

diff | patch | tree

Florian Obser

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

OK stsp

diff | patch | tree

Florian Obser

Do not ignore I/O errors.

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

diff | patch | tree

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

diff | patch | tree

Stefan Sperling

move more opentemp out of diffreg.c

ok tracey

diff | patch | tree

Stefan Sperling

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

ok tracey

diff | patch | tree

Tracey Emery

move got_opentempfd out of open_blob. ok stsp@

diff | patch | tree

Omar Polo

build with -Wmissing-prototypes

ok stsp@

diff | patch | tree

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@

diff | patch | tree

Stefan Sperling

move creation of tempfiles outside of lib/diff.c

ok tracey

diff | patch | tree

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@

diff | patch | tree