Commit Briefs

ab0b42add3 Thomas Adam

portable: release 0.97 (tags/0.97)


c28071389a Thomas Adam

bump version number


4669dd78b5 Thomas Adam

CHANGES for 0.97


be9db6c2d0 Thomas Adam

add an xfail test for a case where rebase fails to forward a branch

Because 'got rebase' only does a first-parent traversal it will try to rebase commits which appear in the history of a branch, even when the branch to be rebased is already based on that history. This results in spurious merge conflicts as existing changes get re-applied. The desired behaviour would be that 'got rebase' forwards the branch, as it does when the 'got merge -M' command used by this test case is replaced by a simple 'got merge' which avoids creating a merge commit. Problem reported by naddy in the "Landry's firefox repository" thread: https://marc.gameoftrees.org/mail/1706721001.20565_0.html




202f996b29 Thomas Adam

adjust min_datalen in a few places

Fix the computation of min_datalen that was forgotten in 8f137979fc5e284a136cf8950e8b3895d7ea208b. got_privsep_recv_imsg() already takes care of converting GOT_IMSG_ERROR to errors, so just how we didn't need to call recv_imsg_error() at all, we don't need to include it in the requested min_datalen.


b150577011 Thomas Adam

swap the order of the checks to not hide an error

If a libexec process returns an GOT_IMSG_ERROR that happens to be smaller than the requested min_datalen, got_privsep_recv_imsg() returns GOT_IMSG_PRIVSEP_LEN hiding the original error. ok stsp@


2633cf30b7 Thomas Adam

attempt to speed up the deltification for big files

The current hash table perform poorly on big files due to a small resize step that pushes the table to its limits continuously. Instead, to have both a better performing hash table and keep the memory consumption low, save the blocks in an array and use the hash table as index. Then, use a more generous resizing scheme that guarantees the good properties of the hash table. To avoid having to rebuild the table when the array is resized, save the indexes in the table, and to further reduce the memory consumption use 32 bit indices. On amd64 this means that each slot is 4 bytes instead of 8 for a pointer or 24 for a struct got_deltify_block. ok stsp@


54e3887813 Thomas Adam

fix invalid imsg_free() in got_privsep_recv_printed_commits()

Depending on the error got_privsep_recv_imsg() may leave imsg un-initialized, so change it to always free the imsg on error if needed, so callers don't have to. got_privsep_recv_printed_commits() and got-read-patch were the only places where we could end up calling imsg_free() on uninitialized imsg, fix them. ok stsp@


eb0f0005dd Thomas Adam

improve execv error message

spotted using -portable on a system without openssh installed. Showing the program we've failed to exec can be handy. ok stsp@


9743baabb6 Thomas Adam

portable: set next version


9e81f59ef9 Thomas Adam

portable: release 0.96 (tags/0.96)


0617f4a52e Thomas Adam

bump version number


e25480b8d0 Thomas Adam

CHANGES for 0.96


4ad67b987e Thomas Adam

never write accum_buf on error in got_pack_dump_delta_chain_to_file()

and also avoid to override `err' if fwrite fails. ok millert, stsp


4f46fcf888 Thomas Adam

fix use of uninitialized variable in update_blob

spotted by smatch. ok millert@


9f6f4b2b2a Thomas Adam

plug memory leak in got_pack_dump_delta_chain_to_file()

found by smatch. ok stsp@


9c57c4c681 Thomas Adam

fmt


2de89b6b79 Thomas Adam

pass the argument to calloc in the right order; no-op in practice

reported by smatch.


7a4d2c2441 Thomas Adam

fix logging during gotwebd shutdown

During `rcctl stop gotwebd' the sockets process gets a SIGTERM and dies, and this makes the parent process assume it exited abnormally. Instead, catch SIGINT and SIGTERM and exit gracefully. Issue reported by xs on IRC. ok jamsek


53f578a6d9 Thomas Adam

gotwebd: fix colour of target lines in dark mode

reported by xs on IRC, thanks!


75986fe9c4 Thomas Adam

Test log -b <path> traversing a merge commit.

This tests for the bug fixed by c8255edc. ok stsp@


bae38d30ef Thomas Adam

handle merge commits that are unrelated to requested changed path history

Problem found and fix tested by James Cook.


2698e19876 Thomas Adam

portable: CI: update FreeBSD image

Bump the FreeBSD image used on Cirrus-CI to FreeBSD-13-2