Commit Briefs

Thomas Adam

sync files from diff.git b5a9c15f4d68c06ec3bf839529b3ed2def0a6af6

Fixes 'No newline at end of file' message appearing in unexpected places. Problem noticed by op@


Thomas Adam

sync files from diff.git dc306c6bd88271ab911e205539974da98be82d17

This restores the traditional diff -p behaviour in Got.


Thomas Adam

sync files from diff.git f26db7cd2804ebc6a3f81e7e00e008450eb42228

Contains new APIs for chunk offset retrieval.



Thomas Adam

sync files from diff.git 1edd9c2b609adfa7ed93dbd839b7d683e695feaa

Brings in improved accuracy of function prototypes in hunk headers.



Thomas Adam

sync files from diff.git b72f51ffc39028023059fc994542565691b669fa

This fixes a scrolling problem in tog's diff view for diffs which contain lines of the form "Binary files %s and %s differ".






Stefan Sperling

merge new diff implementation from the git.gameoftrees.org diff.git repository

This new diff implementation was started by Neels Hofmeyr during the u2k20 hackathon and now replaces diffreg.c code lifted from the OpenBSD base system. The integration of this code into Got was done by me. Got now uses the patience diff algorithm by default. The diff.git repository will remain the primary repository for the diff code, which already compiles and runs on other operating systems such as Linux. Any fixes and improvements for files inherited from the diff.git repository should be written against that repository and synced to got.git afterwards.