This is a re-roll of [1].
This patch series improves test coverage of git-pull.sh, and 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.
Thanks Junio, Johannes and Stefan for the reviews last round.
[1] http://thread.gmane.org/gmane.comp.version-control.git/269236
Paul Tan (8):
t5520: prevent field splitting in content comparisons
t5520: test 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
t5520: check reflog action in fast-forward merge
t/t5520-pull.sh | 198 +++++++++++++++++++++++++++++++++++++++---------
t/t5521-pull-options.sh | 13 ++++
2 files changed, 175 insertions(+), 36 deletions(-)
--
2.1.4