test: fix post rewrite hook report

First expected, then actual.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Acked-by: Thomas Rast <trast@inf.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
sha1_file: trivial style cleanup

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'kb/status-ignored-optim-2'

Fix 1.8.3 regressions in the .gitignore path exclusion logic.

* kb/status-ignored-optim-2:
  dir.c: fix ignore processing within not-ignored directories
Sync with maint
Merge branch 'fc/send-email-chainreplyto-warning' into next

An overdue removal of a "behaviour changed at 1.7.0; if you were
living in a cave, here is what you can adjust to it" message.

* fc/send-email-chainreplyto-warning:
  send-email: remove warning about unset chainreplyto
Merge branch 'fc/cleanups' into next

* fc/cleanups:
  test: rebase: fix --interactive test
  test: trivial cleanups
  remote: trivial style cleanup
Merge branch 'fc/makefile' into next

* fc/makefile:
  build: do not install git-remote-testpy
  build: add NO_INSTALL variable
  build: cleanup using $<
  build: cleanup using $^
  build: trivial simplification
Merge branch 'nd/prune-packed-dryrun-verbose' into next

* nd/prune-packed-dryrun-verbose:
  prune-packed: avoid implying "1" is DRY_RUN in prune_packed_objects()
Merge branch 'rj/mingw-compat-st-mode-bits' into next

* rj/mingw-compat-st-mode-bits:
  path: Fix a sparse warning
Merge branch 'rs/commit-m-no-edit' into next

"git commit --allow-empty-message -m ''" should not start an editor.

* rs/commit-m-no-edit:
  commit: don't start editor if empty message is given with -m
Merge branch 'rr/zsh-color-prompt' into next

* rr/zsh-color-prompt:
  prompt: colorize ZSH prompt
  prompt: factor out gitstring coloring logic
  prompt: introduce GIT_PS1_STATESEPARATOR
Merge branch 'dm/unbash-subtree' into next

It turns out that git-subtree script does not have to be run with
bash.

* dm/unbash-subtree:
  contrib/git-subtree: Use /bin/sh interpreter instead of /bin/bash
Merge branch 'fc/transport-helper-no-refspec' into next

With "export" remote-helper protocol,

 (1) a push that tries to update a remote ref whose name is
     different from the pushing side does not work yet; and

(2) the helper may not know how to do --dry-run,

Detect such problematic cases and disable them for now.

* fc/transport-helper-no-refspec:
  transport-helper: check if the dry-run is supported
  transport-helper: barf when user tries old:new
Merge branch 'th/bisect-skip-report-range-fix' into next

Fix for an additional bisect log comments.

* th/bisect-skip-report-range-fix:
  bisect: Fix log output for multi-parent skip ranges
Merge branch 'tr/push-no-verify-doc' into next

"git push --[no-]verify" was not documented.

* tr/push-no-verify-doc:
  Document push --no-verify
Merge branch 'tg/maint-zsh-svn-remote-prompt' into next

zsh prompt script that borrowed from bash prompt script did not
work due to slight differences in array variable notation between
these two shells.

* tg/maint-zsh-svn-remote-prompt:
  prompt: fix show upstream with svn and zsh
Merge branch 'jc/core-checkstat' into next

The documented core.checkstat variable was not actually implemented
in v1.8.2; instead core.statinfo was.

* jc/core-checkstat:
  deprecate core.statinfo at Git 2.0 boundary
Merge branch 'nd/urls-doc-no-file-hyperlink-fix' into next

* nd/urls-doc-no-file-hyperlink-fix:
  urls.txt: avoid auto converting to hyperlink
Merge branch 'rr/die-on-missing-upstream' into next

When a reflog notation is used for implicit "current branch", we
did not say which branch and worse said "branch ''".

* rr/die-on-missing-upstream:
  sha1_name: fix error message for @{<N>}, @{<date>}
  sha1_name: fix error message for @{u}
Merge branch 'ks/difftool-dir-diff-copy-fix' into next

"difftool --dir-diff" did not copy back changes made by the
end-user in the diff tool backend to the working tree in some
cases.

* ks/difftool-dir-diff-copy-fix:
  difftool --dir-diff: allow changing any clean working tree file