git/http.c, branch v2.17.2

Merge branch 'rj/http-code-cleanup'

2018-03-21T18:30:12Z

There was an unused file-scope static variable left in http.c when building for versions of libCURL that is older than 7.19.4, which has been fixed. * rj/http-code-cleanup: http: fix an unused variable warning for 'curl_no_proxy'

http: fix an unused variable warning for 'curl_no_proxy'

2018-03-15T20:11:52Z

Signed-off-by: Ramsay Jones Signed-off-by: Junio C Hamano

Merge branch 'bw/c-plus-plus'

2018-03-06T22:54:07Z

Avoid using identifiers that clash with C++ keywords. Even though it is not a goal to compile Git with C++ compilers, changes like this help use of code analysis tools that targets C++ on our codebase. * bw/c-plus-plus: (37 commits) replace: rename 'new' variables trailer: rename 'template' variables tempfile: rename 'template' variables wrapper: rename 'template' variables environment: rename 'namespace' variables diff: rename 'template' variables environment: rename 'template' variables init-db: rename 'template' variables unpack-trees: rename 'new' variables trailer: rename 'new' variables submodule: rename 'new' variables split-index: rename 'new' variables remote: rename 'new' variables ref-filter: rename 'new' variables read-cache: rename 'new' variables line-log: rename 'new' variables imap-send: rename 'new' variables http: rename 'new' variables entry: rename 'new' variables diffcore-delta: rename 'new' variables ...

http: rename 'new' variables

2018-02-22T18:08:05Z

Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams Signed-off-by: Junio C Hamano

Merge branch 'jt/http-redact-cookies'

2018-02-13T21:39:11Z

The http tracing code, often used to debug connection issues, learned to redact potentially sensitive information from its output so that it can be more safely sharable. * jt/http-redact-cookies: http: support omitting data from traces http: support cookie redaction when tracing

Merge branch 'cc/sha1-file-name'

2018-02-13T21:39:10Z

Code clean-up. * cc/sha1-file-name: sha1_file: improve sha1_file_name() perfs sha1_file: remove static strbuf from sha1_file_name()

http: support omitting data from traces

2018-01-19T21:06:57Z

GIT_TRACE_CURL provides a way to debug what is being sent and received over HTTP, with automatic redaction of sensitive information. But it also logs data transmissions, which significantly increases the log file size, sometimes unnecessarily. Add an option "GIT_TRACE_CURL_NO_DATA" to allow the user to omit such data transmissions. Signed-off-by: Jonathan Tan Signed-off-by: Junio C Hamano

http: support cookie redaction when tracing

2018-01-19T21:06:50Z

When using GIT_TRACE_CURL, Git already redacts the "Authorization:" and "Proxy-Authorization:" HTTP headers. Extend this redaction to a user-specified list of cookies, specified through the "GIT_REDACT_COOKIES" environment variable. Signed-off-by: Jonathan Tan Signed-off-by: Junio C Hamano

sha1_file: remove static strbuf from sha1_file_name()

2018-01-17T20:21:32Z

Using a static buffer in sha1_file_name() is error prone and the performance improvements it gives are not needed in many of the callers. So let's get rid of this static buffer and, if necessary or helpful, let's use one in the caller. Suggested-by: Jeff Hostetler Helped-by: Kevin Daudt Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano

Merge branch 'rs/use-argv-array-in-child-process'

2018-01-05T21:28:10Z

Code cleanup. * rs/use-argv-array-in-child-process: send-pack: use internal argv_array of struct child_process http: use internal argv_array of struct child_process