Commit Briefs

Stefan Sperling

addblk() may seek in its input file; reposition the file pointer afterwards

diff | patch | tree

Stefan Sperling

addblk: iterate over the correct number of entries after growing the array

ok naddy

diff | patch | tree

Stefan Sperling

addblk: be more careful about expanding the blocks array when we outgrow it

fixes + ok naddy

diff | patch | tree

Stefan Sperling

check a block's hash as well as its length before expensive comparisons

suggested by + ok naddy, and Ori agrees

diff | patch | tree

Stefan Sperling

remove stray debug print which was accidentally committed

diff | patch | tree

Stefan Sperling

avoid uninitialized error being returned from got_repo_get_packfile_info()

diff | patch | tree

Stefan Sperling

simplify deflate checksumming code; fixes errors with upcoming 'gotadmin pack'

tweak + ok naddy

diff | patch | tree

Stefan Sperling

fix unrelated changes being merged by got cherrypick/backout/rebase/histedit

This was a long-standing and very annoying bug. The two xfail tests in the cherrypick test suite are passing now.

diff | patch | tree

Stefan Sperling

switch merge_file_cb() to using merge_file() instead of merge_blob()

diff | patch | tree

Stefan Sperling

decouple merge_file() parameters for 2nd derived version and merge target file

diff | patch | tree

Stefan Sperling

in merge_file(), remove allocation of a base_path which is unused

diff | patch | tree

Stefan Sperling

move merge_file()'s f_deriv parameter next to the f_orig parameter

diff | patch | tree

Stefan Sperling

make merge_file() accept FILEs instead of paths for orig and deriv inputs

diff | patch | tree

Stefan Sperling

refactor merge_file() such that it no longer requires a blob object parameter

diff | patch | tree

Stefan Sperling

add an xfail test for a cherrypick bug where unrelated changes get merged

The test case I am using here is a bit large but I could not yet find a way to make it smaller. If someone knows a smaller test case, please let me know. naddy caught a small bug in the new test code I had written, thanks!

diff | patch | tree