add simple tests of consistency across rebase types

Helped-by: Johannes Sixt <j6t@kdbg.org>

Signed-off-by: Junio C Hamano <gitster@pobox.com>
add tests for rebasing with patch-equivalence present

Signed-off-by: Junio C Hamano <gitster@pobox.com>
add tests for rebasing of empty commits

Signed-off-by: Junio C Hamano <gitster@pobox.com>
add tests for rebasing root

Signed-off-by: Junio C Hamano <gitster@pobox.com>
add tests for rebasing merged history

Signed-off-by: Junio C Hamano <gitster@pobox.com>
t3406: modernize style

Update the following:

 - Quote 'setup'
 - Remove blank lines within test case body
 - Use test_commit instead of custom quick_one
 - Create branch "topic" from tag created by test_commit

Signed-off-by: Junio C Hamano <gitster@pobox.com>
tests: move test for rebase messages from t3400 to t3406

t3406 is supposed to test "messages from rebase operation", so let's
move tests in t3400 that fit that description into 3406. Most of the
functionality they tested, except for the messages, has now been
subsumed by t3420.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-remote-mediawiki: use git.pm functions for credentials

In 52dce6d, a new credential function was added to git.pm, based on
git-remote-mediawiki's functions. The logical follow-up is to use
those functions in git-remote-mediawiki.

Signed-off-by: Benoit Person <benoit.person@ensimag.fr>
Signed-off-by: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'fc/send-email-chainreplyto-warning' into jch

An overdue removal od "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 jch

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

* 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 jch

* 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 jch

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

"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 jch

* 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 jch

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 jch

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, so 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

# Conflicts:
# 	transport-helper.c
Merge branch 'th/bisect-skip-report-range-fix' into jch

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 jch

"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 jch

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