Commit Briefs

Stefan Sperling

make tmp dir location a compile-time setting and change gotweb's tmp dir

We are not sure whether a gotweb package can own /var/www/tmp on OpenBSD. Moving gotweb's tmp dir to /var/www/got/tmp sidesteps that issue.

diff | patch | tree

Stefan Sperling

fix build on sparc64 (uninitialized variable) (tags/0.18)

diff | patch | tree

Stefan Sperling

show base commit hash and omit filenames in conflict markers

diff | patch | tree

Stefan Sperling

show original file content in conflict markers

diff | patch | tree

Stefan Sperling

improve use of mixed size_t/off_t types in diff3.c's edscript()

diff | patch | tree

Stefan Sperling

diff3.c: do not use the same variables for both line numbers and byte offsets

diff | patch | tree

Stefan Sperling

diff3.c's skip() returns number of bytes skipped so switch from int to size_t

diff | patch | tree

Stefan Sperling

remove worklist code; it was only used to unlink files which we already unlink

diff | patch | tree

Stefan Sperling

diff3.c: check for unlink errors and unlink dp13 and dp23 again

diff | patch | tree

Stefan Sperling

rename local variable in diff3.c's edscript() from j to len (not a loop index)

diff | patch | tree

Stefan Sperling

rename local variable in diff3.c's skip() from j to len (not a loop index)

diff | patch | tree

Stefan Sperling

remove pointless attempt of unlinking temporary file name template paths

diff | patch | tree

Stefan Sperling

do not leak open file in diff3.c's readin() error paths

diff | patch | tree

Stefan Sperling

do not abuse d3s->fp[0] as a local variable in diff3.c's readin()

diff | patch | tree

Stefan Sperling

remove unused 'pr' argument from diff3.c's skip() function

diff | patch | tree

Stefan Sperling

more mechanical conversions to struct got_error: buf_load() and buf_alloc()

diff | patch | tree

Stefan Sperling

some whitespace fixes in diff3.c

diff | patch | tree

Stefan Sperling

check for errors from buf_append() in diff3.c's diff_output()

diff | patch | tree

Stefan Sperling

remove pointless debug code from diff3.c

diff | patch | tree

Stefan Sperling

eflag in diff3.c is hard-coded to 3; remove code for other cases

diff | patch | tree

Stefan Sperling

check for errors from fseek(3) in diff3.c's edscript()

diff | patch | tree

Stefan Sperling

check for errors from diff_output() in diff3.c

diff | patch | tree

Stefan Sperling

convert remaining functions in diff3.c to struct got_error

diff | patch | tree

Stefan Sperling

convert error handling in diff3.c's repos() to struct got_error

diff | patch | tree

Stefan Sperling

convert handling in diff3.c's merge() function to struct got_error

diff | patch | tree