Sat, 7 Dec 2019 20:10:12 +0100

Merge 'readme' into HEAD

Add a README.md for GitHub goodness.

Signed-off-by: Johannes Schindelin <[email protected]>

Fri, 6 Dec 2019 21:17:14 +0100

Merge pull request #2422 from dscho/add-i-p-updates

Synchronize built-in add -i/-p patches with upstream

Mon, 25 Nov 2019 23:21:29 +0100

Merge pull request #2405 from dscho/mingw-setsockopt

Make sure `errno` is set when socket operations fail

Mon, 25 Nov 2019 14:32:52 +0100

Merge pull request #2415 from dscho/fix-t2040

Fix t2040

Sat, 16 Nov 2019 00:47:52 +0100

Merge pull request #2402 from dscho/add-i-in-c-status-and-help-gfw

built-in add -i/-p: update to latest iteration

Wed, 6 Nov 2019 10:24:11 +0100

squash! remote-curl: unbreak http.extraHeader with custom allocators

remote-curl: unbreak http.extraHeader with custom allocators

In 93b980e58f5 (http: use xmalloc with cURL, 2019-08-15), we started to
ask cURL to use `xmalloc()`, and if compiled with nedmalloc, that means
implicitly a different allocator than the system one.

Which means that all of cURL's allocations and releases now _need_ to
use that allocator.

However, the `http_options()` function used `slist_append()` to add any
configured extra HTTP header(s) _before_ asking cURL to use `xmalloc()`,
and `http_cleanup()` would release them _afterwards_, i.e. in the
presence of custom allocators, cURL would attempt to use the wrong
allocator to release the memory.

A naïve attempt at fixing this would move the call to
`curl_global_init()` _before_ the config is parsed (i.e. before that
call to `slist_append()`).

However, that does work, as we _also_ parse the config setting
`http.sslbackend` and if found, call `curl_global_sslset()` which *must*
be called before `curl_global_init()`, for details see:
https://curl.haxx.se/libcurl/c/curl_global_sslset.html

So let's instead make the config parsing entirely independent from
cURL's data structures. Incidentally, this deletes two more lines than
it introduces, which is nice.

Signed-off-by: Johannes Schindelin <[email protected]>

Tue, 5 Nov 2019 23:56:34 +0100

Merge pull request #2391 from dscho/fixup-gitk-long-cmdline

Fix refresh error in gitk

Tue, 5 Nov 2019 00:11:27 +0100

remote-curl: unbreak http.extraHeader with custom allocators

In 93b980e58f5 (http: use xmalloc with cURL, 2019-08-15), we started to
ask cURL to use `xmalloc()`, and if compiled with nedmalloc, that means
implicitly a different allocator than the system one.

Which means that all of cURL's allocations and releases now _need_ to
use that allocator.

However, the `http_options()` function used `slist_append()` to add any
configured extra HTTP header(s) _before_ asking cURL to use `xmalloc()`,
and `http_cleanup()` would release them _afterwards_, i.e. in the
presence of custom allocators, cURL would attempt to use the wrong
allocator to release the memory.

Let's fix this by moving the initialization _before_ the
`http_options()` function is called.

Signed-off-by: Johannes Schindelin <[email protected]>

Mon, 4 Nov 2019 07:35:12 +0100

Merge 'readme' into HEAD

Add a README.md for GitHub goodness.

Signed-off-by: Johannes Schindelin <[email protected]>

Sun, 3 Nov 2019 00:23:26 +0100

Merge pull request #2383 from derrickstolee/fetch-first-write-fail

Fix `fetch.writeCommitGraph` failure first fetch