Commit Briefs

Omar Polo

use the commitid in the patch diff3 conflict header

suggested by and ok stsp@

diff | patch | tree

Omar Polo

got patch: use diff3 to merge the changes

Parse the "blob -" metadata in diffs produced by 'got diff' and use the original file for patching. Then, use the diff3 with the current version of the file to merge the differences. This solves many failures automagically or at least turns them into a conflict. ok/improvements stsp@

diff | patch | tree

Omar Polo

patch_file: fill tmp with the patched file even in nop mode

future work with diff3 merge will need the fully patched file even in the nop mode ok stsp@

diff | patch | tree

Omar Polo

patch_file: move file ownership to parent

ok stsp@

diff | patch | tree

Stefan Sperling

bump version number

diff | patch | tree

Stefan Sperling

CHANGES for 0.72 (tags/0.72)

diff | patch | tree

Stefan Sperling

small grammar and accuracy fixes in a comment

diff | patch | tree

Stefan Sperling

add missing braces around multi-line if-statement body; pointed out by op@

diff | patch | tree

Stefan Sperling

take tog selection cursor position into account when searching for next match

Patch by Mikhail ok op@ jamsek

diff | patch | tree

Stefan Sperling

wrap an overlong line in enumeration_request()

diff | patch | tree

Stefan Sperling

fix unexpected imsg error after incomplete enumeration in got-read-pack

reported by jrick and op@ ok op@

diff | patch | tree

Omar Polo

tog: reset matched and search data after C-l

otherwise they point to free'd data. ok stsp@

diff | patch | tree

Omar Polo

memset all stack-allocated structs used to send messages; ok stsp@

diff | patch | tree

Omar Polo

zero the whole struct got_imsg_object before sending it

otherwise some fields may be unitialized and fail the validation done on the receiving side. ok stsp@

diff | patch | tree

Stefan Sperling

bump version number

diff | patch | tree