Commit Briefs

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

Hiltjo Posthuma

getline: fix the return type to ssize_t and small nits

diff | patch | tree

Stefan Sperling

remove pointless oflag from struct diff3_state

diff | patch | tree

Stefan Sperling

Replace fgetln() with getline()

getline() is, per the latter's OpenBSD man page, safer and more portable than fgetln().

diff | patch | tree

Stefan Sperling

sync merge(1) fix diff from OpenRCS/OpenCVS

diff | patch | tree

Stefan Sperling

fix merge bug inherited from OpenRCS, affecting lines with leading .

diff | patch | tree

Stefan Sperling

rename got_error_prefix_errno() to got_error_from_errno()

diff | patch | tree

joshua stein

got_error_from_errno -> got_error_prefix_errno

also add got_error_prefix_errno2 and got_error_prefix_errno3 which should hopefully all be merged into a single function with variadic args (but can't alloc mem)

diff | patch | tree

Stefan Sperling

declare conflict marker strings in got_lib_diff.h

diff | patch | tree

Stefan Sperling

check for errors from fclose()

diff | patch | tree

Stefan Sperling

check for fflush() errors

diff | patch | tree

Stefan Sperling

allow callers of diff3 code to detect merge conflicts

diff | patch | tree

Stefan Sperling

diff3: make labels work and fix leaks

diff | patch | tree

Stefan Sperling

initialize temp_files in got_merge_diff3()

diff | patch | tree

Stefan Sperling

make readin() actually write to its output argument

diff | patch | tree