diff options
| author |  Jeff King <peff@peff.net> | 2012-10-29 04:13:09 -0400 |
|---|---|---|
| committer | Jeff King <peff@peff.net> | 2012-10-29 04:13:09 -0400 |
| commit | 58f3f9893dc287bd5b7ec4bbd3fc56b77e126e6c (patch) | |
| tree | 61abd02b0c8582a9266fd087d5e99aac6bc2b4ab /builtin/merge-file.c | |
| parent | Merge branch 'jc/grep-pcre-loose-ends' (diff) | |
| parent | http: do not set up curl auth after a 401 (diff) | |
| download | tgif-58f3f9893dc287bd5b7ec4bbd3fc56b77e126e6c.tar.xz | |
Merge branch 'jk/maint-http-init-not-in-result-handler'
Further clean-up to the http codepath that picks up results after
cURL library is done with one request slot.
* jk/maint-http-init-not-in-result-handler:
http: do not set up curl auth after a 401
remote-curl: do not call run_slot repeatedly
Diffstat (limited to 'builtin/merge-file.c')
0 files changed, 0 insertions, 0 deletions