Commits
- Commit:
68bdcdc2f5d3c37d918f85368c2537a8aa7d90eb
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
addblk() may seek in its input file; reposition the file pointer afterwards
- Commit:
a893025fd207950945eed1482170223a2d3b9ce3
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
addblk: iterate over the correct number of entries after growing the array
ok naddy
- Commit:
e89540a95a268f47ef2d1b24c41fbb72a1f0bdc9
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
addblk: be more careful about expanding the blocks array when we outgrow it
fixes + ok naddy
- Commit:
51a494da48acb57ed84501a6d10f39ed624c711e
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
check a block's hash as well as its length before expensive comparisons
suggested by + ok naddy, and Ori agrees
- Commit:
282f42e5d1095015379b49280429e558b3bbc4fe
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
remove stray debug print which was accidentally committed
- Commit:
0c9eeee21134b27edd7528f489391f9ded46ffb1
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
avoid uninitialized error being returned from got_repo_get_packfile_info()
- Commit:
3b9e6fcfb6688f928cfe62fee08d34d6c8d85992
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
simplify deflate checksumming code; fixes errors with upcoming 'gotadmin pack'
tweak + ok naddy
- Commit:
54d5be07768d1e312078b5eb60f0e32738a1631a
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
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.
- Commit:
1af628f4bfa50c224b392a774e72a213c97f6009
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
switch merge_file_cb() to using merge_file() instead of merge_blob()
- Commit:
eec2f5a957bde0458cfa8ee022528e4aeabb708e
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
decouple merge_file() parameters for 2nd derived version and merge target file
- Commit:
dc082d4a7ad5857602ab64aaea1f836ce47b689b
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
in merge_file(), remove allocation of a base_path which is unused
- Commit:
07bb0f933a402d7387f7dd360060c55cdd1b56c0
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
move merge_file()'s f_deriv parameter next to the f_orig parameter
- Commit:
db59069162efd1ccd4f236abe7d8eb3ca4b791e4
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make merge_file() accept FILEs instead of paths for orig and deriv inputs
- Commit:
67a666476ff7ffc6e95f7d9b994a8f7b01cb86e5
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
refactor merge_file() such that it no longer requires a blob object parameter
- Commit:
3cd22b214454d9973c61426c8a4bd7cf2f8de6ae
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
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!