Merge branch 'ep/http-curl-trace'
authorJunio C Hamano <gitster@pobox.com>
Wed, 6 Jul 2016 20:38:06 +0000 (13:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 Jul 2016 20:38:06 +0000 (13:38 -0700)
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

1  2 
Documentation/git.txt
http.c
http.h
imap-send.c
index b0611eaab468879c0138204143bbac020c2f7353,958db0fc654657b38d7b7bbec2625c3db8f340a4..ca611c9f860d420ad49c9acedee72d1a98f55cde
@@@ -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
diff --cc http.c
Simple merge
diff --cc http.h
Simple merge
diff --cc imap-send.c
Simple merge