Commits


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


remove pointless debug code from diff3.c


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


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


check for errors from diff_output() in diff3.c


convert remaining functions in diff3.c to struct got_error


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


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


bump version number


changes for 0.17


Fix misleading wording in got.1 about branch options; -r option always works.


make 'got branch' without args show work tree's branch; requested by benno@


show temporary branch in 'got branch -l' during rebase and histedit


fix bogus error return introduced in previous commit


update reference list when 'tog log' view is refreshed with Ctrl+L


make 'got status' read .gitignore files; support **/ and /**/ in patterns


handle empty trees during 'import' and 'checkout'; spotted by sthen@


Show only whitelisted commit headers in 'got log' Generic way to deal with gpgsig header or extra headers added by some tools. All headers still available via 'got cat' ok stsp@


getline: fix the return type to ssize_t and small nits


direct patch reviews and other discussion away from my private inbox


remove pointless oflag from struct diff3_state


bump version number


CHANGES for 0.16


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


Add missing includes for time() and ctime() These headers were implicitly used on OpenBSD, but building on Linux revealed that <time.h> wasn't included directly. diffreg.c uses ctime(), which additionally needs <sys/types.h>.