Test which shows the commit count reset to 0 when merging into the re…

[taborda]

…lease branch in continuous deployment mode

Tests behavior seen in #814

[asbjornu]

@taborda Thanks for this! However, git rev-list --count master shows that this PR is now 1730 commits behind master. Could you please do a rebase and ensure that the test fails the same way afterwards? The EmptyRepositoryFixture being used is no longer included in GitVersion, but from GitTools.Testing, so it might behave a bit differently (it doesn't take a Config parameter, for instance).

[asbjornu]

@taborda Great! But can you please rebase (not merge) on master so it gets the fixes in #876 that ensures the Travis build is run? The easiest way to do this in a tidy way would probably be to do:

git checkout ReleaseBranchMergeCountReset
git branch ReleaseBranchMergeCountReset-Backup
git reset --hard upstream/master
git cherry-pick -n 64b40bb936f3ba4403123d55bae4f8a24aabf966
git cherry-pick -e 735cf8a31344cc352f31e5b5293c783947cb8d65

This way you get to the HEAD of master in upstream (i.e. this repository) with the valuable commits in this PR. If you make a mistake, you can always reset back to ReleaseBranchMergeCountReset-Backup created on line 2.

Please just ask here or on Gitter if you have any problems or questions!

[JakeGinnivan]

Verify #832 fixes this by pulling this test in to that branch