From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 6 Jul 2016 20:38:06 +0000 (-0700)
Subject: Merge branch 'ep/http-curl-trace'
X-Git-Tag: v2.10.0-rc0~169
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2f84df2ca0f7a5174d2eb5f4ee52324ce8f807b9;p=thirdparty%2Fgit.git

Merge branch 'ep/http-curl-trace'

HTTP transport gained an option to produce more detailed debugging
trace.

* ep/http-curl-trace:
  imap-send.c: introduce the GIT_TRACE_CURL enviroment variable
  http.c: implement the GIT_TRACE_CURL environment variable
---

2f84df2ca0f7a5174d2eb5f4ee52324ce8f807b9
diff --cc Documentation/git.txt
index b0611eaab4,958db0fc65..ca611c9f86
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -1068,22 -1060,30 +1068,30 @@@ Unsetting the variable, or setting it t
  Note that this is currently only implemented for the client side
  of clones and fetches.
  
 -'GIT_TRACE_PERFORMANCE'::
 +`GIT_TRACE_PERFORMANCE`::
  	Enables performance related trace messages, e.g. total execution
  	time of each Git command.
 -	See 'GIT_TRACE' for available trace output options.
 +	See `GIT_TRACE` for available trace output options.
  
 -'GIT_TRACE_SETUP'::
 +`GIT_TRACE_SETUP`::
  	Enables trace messages printing the .git, working tree and current
  	working directory after Git has completed its setup phase.
 -	See 'GIT_TRACE' for available trace output options.
 +	See `GIT_TRACE` for available trace output options.
  
 -'GIT_TRACE_SHALLOW'::
 +`GIT_TRACE_SHALLOW`::
  	Enables trace messages that can help debugging fetching /
  	cloning of shallow repositories.
 -	See 'GIT_TRACE' for available trace output options.
 +	See `GIT_TRACE` for available trace output options.
  
 -'GIT_TRACE_CURL'::
++`GIT_TRACE_CURL`::
+ 	Enables a curl full trace dump of all incoming and outgoing data,
+ 	including descriptive information, of the git transport protocol.
 -	This is similar to doing curl --trace-ascii on the command line.
 -	This option overrides setting the GIT_CURL_VERBOSE environment
++	This is similar to doing curl `--trace-ascii` on the command line.
++	This option overrides setting the `GIT_CURL_VERBOSE` environment
+ 	variable.
 -	See 'GIT_TRACE' for available trace output options.
++	See `GIT_TRACE` for available trace output options.
+ 
 -'GIT_LITERAL_PATHSPECS'::
 +`GIT_LITERAL_PATHSPECS`::
  	Setting this variable to `1` will cause Git to treat all
  	pathspecs literally, rather than as glob patterns. For example,
  	running `GIT_LITERAL_PATHSPECS=1 git log -- '*.c'` will search