This patch series improves test coverage of git-pull.sh.
This is part of my GSoC project to rewrite git-pull into a builtin. Improving
test coverage helps to prevent regressions that could occur due to the rewrite.
The previous patch series can be found at [1]. Note that it is now based on
jc/merge in pu.
Besides fixing issues raised in the last round, some failing tests have been
added to demonstrate some bugs in git-pull.sh, and some tests are modified to
reduce their dependence on git-pull's functionality so that irrelevant test
suites will not break during the rewrite.
[1] http://thread.gmane.org/gmane.comp.version-control.git/268231
Paul Tan (12):
t5520: implement tests for no merge candidates cases
t5520: test for failure if index has unresolved entries
t5520: test work tree fast-forward when fetch updates head
t5520: test --rebase with multiple branches
t5520: test --rebase failure on unborn branch with index
t5521: test --dry-run does not make any changes
t4013: call git-merge instead of git-pull
t5520: ensure origin refs are updated
t7406: use "git pull" instead of "git pull --rebase"
t5520: failing test for pull --all with no configured upstream
t5524: test --log=1 limits shortlog length
t5520: check reflog action in fast-forward merge
t/t4013-diff-various.sh | 2 +-
t/t5520-pull.sh | 148 +++++++++++++++++++++++++++++++++++++++++++-
t/t5521-pull-options.sh | 13 ++++
t/t5524-pull-msg.sh | 17 +++++
t/t7406-submodule-update.sh | 2 +-
5 files changed, 177 insertions(+), 5 deletions(-)
--
2.1.4