Commit Briefs

Stefan Sperling

use Patience diff for merging during cherrypick/backout/histedit/rebase

This has been shown to prevent mis-merges in some cases. It's probably not a final solution. We should look at what Git's "recursive merge" is doing and implement something similar. Keep using Myers during update/unstage. The advantage of Myers is that it produces smaller conflict chunks, and there are no known cases of mis-merges which affect update/unstage.

diff | patch | tree

Stefan Sperling

check for close(2) error in got_repo_close() and propagate errors up

ok tracey

diff | patch | tree

Tracey Emery

close all opened repo->gitdir_fd's and set open_repo static. ok naddy (with static change)

diff | patch | tree

Stefan Sperling

in addblk(), only read data into buffer1 if we will compare it to buffer2

suggested by and ok naddy@

diff | patch | tree

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