delta/git.git, branch ep/http-curl-trace

imap-send.c: introduce the GIT_TRACE_CURL enviroment variable

2016-05-24T22:48:18+00:00

Permit the use of the GIT_TRACE_CURL environment variable calling
the setup_curl_trace http.c helper routine.

Helped-by: Torsten Bögershausen 
Helped-by: Ramsay Jones 
Helped-by: Junio C Hamano 
Helped-by: Eric Sunshine 
Helped-by: Jeff King 
Signed-off-by: Elia Pinto 
Signed-off-by: Junio C Hamano

http.c: implement the GIT_TRACE_CURL environment variable

2016-05-24T22:48:18+00:00

Implement the GIT_TRACE_CURL environment variable to allow a
greater degree of detail of GIT_CURL_VERBOSE, in particular
the complete transport header and all the data payload exchanged.
It might be useful if a particular situation could require a more
thorough debugging analysis. Document the new GIT_TRACE_CURL
environment variable.

Helped-by: Torsten Bögershausen 
Helped-by: Ramsay Jones 
Helped-by: Junio C Hamano 
Helped-by: Eric Sunshine 
Helped-by: Jeff King 
Signed-off-by: Elia Pinto 
Signed-off-by: Junio C Hamano

Fifth batch for post 2.8 cycle

2016-04-18T17:51:09+00:00

Signed-off-by: Junio C Hamano

Merge branch 'jk/branch-shortening-funny-symrefs'

2016-04-18T17:49:14+00:00

A change back in version 2.7 to "git branch" broke display of a
symbolic ref in a non-standard place in the refs/ hierarchy (we
expect symbolic refs to appear in refs/remotes/*/HEAD to point at
the primary branch the remote has, and as .git/HEAD to point at the
branch we locally checked out).

* jk/branch-shortening-funny-symrefs:
  branch: fix shortening of non-remote symrefs

Merge branch 'ky/branch-m-worktree'

2016-04-18T17:48:11+00:00

When "git worktree" feature is in use, "git branch -m" renamed a
branch that is checked out in another worktree without adjusting
the HEAD symbolic ref for the worktree.

* ky/branch-m-worktree:
  set_worktree_head_symref(): fix error message
  branch -m: update all per-worktree HEADs
  refs: add a new function set_worktree_head_symref

Merge branch 'maint'

2016-04-15T01:59:09+00:00

* maint:
  Prepare for 2.8.2
  Start preparing for 2.8.2

Prepare for 2.8.2

2016-04-15T01:58:11+00:00

Signed-off-by: Junio C Hamano

Merge branch 'jv/merge-nothing-into-void' into maint

2016-04-15T01:57:49+00:00

"git merge FETCH_HEAD" dereferenced NULL pointer when merging
nothing into an unborn history (which is arguably unusual usage,
which perhaps was the reason why nobody noticed it).

* jv/merge-nothing-into-void:
  merge: fix NULL pointer dereference when merging nothing into void

Merge branch 'ss/commit-squash-msg' into maint

2016-04-15T01:57:48+00:00

When "git merge --squash" stopped due to conflict, the concluding
"git commit" failed to read in the SQUASH_MSG that shows the log
messages from all the squashed commits.

* ss/commit-squash-msg:
  commit: do not lose SQUASH_MSG contents

Merge branch 'jk/send-email-rtrim-mailrc-alias' into maint

2016-04-15T01:57:47+00:00

"git send-email" had trouble parsing alias file in mailrc format
when lines in it had trailing whitespaces on them.

* jk/send-email-rtrim-mailrc-alias:
  send-email: ignore trailing whitespace in mailrc alias file