Merge branch 'lt/request-pull'

A brown-paper-bag bugfix to a test that turned out to be a no-op by
mistake.

* lt/request-pull:
  fix brown paper bag breakage in t5150-request-pull.sh
Merge branch 'jc/rev-parse-argh-dashed-multi-words'

"update-index --cacheinfo" in 2.0 crashes on a malformed command line.

* jc/rev-parse-argh-dashed-multi-words:
  update-index: fix segfault with missing --cacheinfo argument
Merge branch 'na/no-http-test-in-the-middle'

The mode to run tests with HTTP server tests disabled was broken.

* na/no-http-test-in-the-middle:
  t5538: move http push tests out to t5542
Merge branch 'pb/trim-trailing-spaces'

Fix an error in parsing of .gitignore files that use a trailing
"\ " to mark pathnames that end with a SP.

* pb/trim-trailing-spaces:
  dir.c:trim_trailing_spaces(): fix for " \ " sequence
Merge branch 'rs/mailinfo-header-cmp'

Avoid running over the end of header string while parsing an
incoming e-mail message to extract the patch.

* rs/mailinfo-header-cmp:
  mailinfo: use strcmp() for string comparison
Merge branch 'mn/sideband-no-ansi'

Tools that read diagnostic output in our standard error stream do
not want to see terminal control sequence (e.g. erase-to-eol).
Detect them by checking if the standard error stream is connected to
a tty.

* mn/sideband-no-ansi:
  sideband.c: do not use ANSI control sequence on non-terminal
Merge branch 'jc/shortlog-ref-exclude'

"log --exclude=<glob> --all | shortlog" worked as expected, but
"shortlog --exclude=<glob> --all" was not accepted at the command
line argument parser level.

* jc/shortlog-ref-exclude:
  shortlog: allow --exclude=<glob> to be passed
Update draft release notes to 2.1

Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'mt/patch-id-stable' (early part) into jch

* 'mt/patch-id-stable' (early part):
  patch-id-test: test stable and unstable behaviour
  test: add test_write_lines helper
  patch-id: make it stable against hunk reordering
Merge branch 'mt/patch-id-stable' (early part) into jch

* 'mt/patch-id-stable' (early part):
  t4204-patch-id.sh: default is now stable
  patch-id: change default to stable
Merge branch 'mt/patch-id-stable' into jch

Introduce a new way to compute patch-id for a patch that is not
affected by the order of the paths that appear in the input.

* mt/patch-id-stable:
  test doc: test_write_lines does not split its arguments
Merge branch 'cb/byte-order' into jch

Compatibility enhancement for Solaris.

* cb/byte-order:
  compat/bswap.h: fix endianness detection
  compat/bswap.h: restore preference __BIG_ENDIAN over BIG_ENDIAN
  compat/bswap.h: detect endianness on more platforms that don't use BYTE_ORDER
Merge branch 'cc/replace-edit' into jch

"git replace" learns a new "--edit" option.

* cc/replace-edit:
  Documentation: replace: describe new --edit option
  replace: add --edit to usage string
  replace: add tests for --edit
  replace: die early if replace ref already exists
  replace: refactor checking ref validity
  replace: make sure --edit results in a different object
  replace: add --edit option
  replace: factor object resolution out of replace_object
  replace: use OPT_CMDMODE to handle modes
  replace: refactor command-mode determination
Merge branch 'mt/send-email-cover-to-cc' (early part) into jch

* 'mt/send-email-cover-to-cc' (early part):
  test/send-email: to-cover, cc-cover tests
  git-send-email: two new options: to-cover, cc-cover
Merge branch 'jk/do-not-run-httpd-tests-as-root' into jch

* jk/do-not-run-httpd-tests-as-root:
  t/lib-httpd: require SANITY prereq
Merge branch 'sk/wincred' into jch

* sk/wincred:
  wincred: avoid overwriting configured variables
  wincred: add install target
Merge branch 'jk/argv-array-for-child-process' into jch

* jk/argv-array-for-child-process:
  argv-array: drop "detach" code
  get_importer: use run-command's internal argv_array
  get_exporter: use argv_array
  get_helper: use run-command's internal argv_array
  git_connect: use argv_array
  run_column_filter: use argv_array
  run-command: store an optional argv_array
Merge branch 'jk/diff-files-assume-unchanged' into jch

* jk/diff-files-assume-unchanged:
  run_diff_files: do not look at uninitialized stat data
Merge branch 'jk/report-fail-to-read-objects-better' into jch

* jk/report-fail-to-read-objects-better:
  open_sha1_file: report "most interesting" errno
Merge branch 'rr/rebase-autostash-fix' into jch

* rr/rebase-autostash-fix:
  rebase -i: test "Nothing to do" case with autostash
  rebase -i: handle "Nothing to do" case with autostash