Bug in the linux docker image? Wrong "commit count source" being taken

[sboardwell]

Hi,

I am getting different versions when running:

• an incorrect version using a linux docker image in version 5.0.0 or 5.0.1 with my repo mounted
• a correct version using the gitversion binary (installed through brew - version 4.0.0+Branch.master.Sha.e715eb5dd515037d90a257f527e62442cae8c1c5)
• a correct version using a linux docker image in version 4.0.1-beta1-65-linux-debian-net472

GitVersion.yaml

$ cat GitVersion.yml
mode: ContinuousDelivery
branches:
  master:
    regex: (stable|master)$
ignore:
  sha: []

The commit in question is a merge commit from master (called stable here) to develop (called dev here).

commit 0bcfa2d4ffc4fafcca3a4b09ee80721ca7fccef9 (tag: v0.1.0, origin/stable, stable)
Merge: 49af14447 f7bd7dda1
Author: Max Mustermann <max@mustermann.de>
Date:   6 days ago

    Merge branch 'release-0.1.0'

Basically it looks like it that the linux image is using the 49af14447 which is very old (1374 commits ago), whereas the 4.0.x versions are using 0bcfa2d4ffc4fafcca3a4b09ee80721ca7fccef9 which is where the tag happens (52 commits ago).

First the MacOS log:

2019-08-06 22:18:56		INFO [08/06/19 22:18:56:23] Working directory: /Users/sboardwell/projects/my-company/my-project
2019-08-06 22:18:56		INFO [08/06/19 22:18:56:26] IsDynamicGitRepository: False
2019-08-06 22:18:56		INFO [08/06/19 22:18:56:28] Returning Project Root from DotGitDirectory: /Users/sboardwell/projects/my-company/my-project/.git - /Users/sboardwell/projects/my-company/my-project
2019-08-06 22:18:56		INFO [08/06/19 22:18:56:28] Running on Mono.
2019-08-06 22:18:56		INFO [08/06/19 22:18:56:28] IsDynamicGitRepository: False
2019-08-06 22:18:56		INFO [08/06/19 22:18:56:28] Returning Project Root from DotGitDirectory: /Users/sboardwell/projects/my-company/my-project/.git - /Users/sboardwell/projects/my-company/my-project
2019-08-06 22:18:56		INFO [08/06/19 22:18:56:28] Project root is: /Users/sboardwell/projects/my-company/my-project
2019-08-06 22:18:56		INFO [08/06/19 22:18:56:28] DotGit directory is: /Users/sboardwell/projects/my-company/my-project/.git
2019-08-06 22:18:56		INFO [08/06/19 22:18:56:41] IsDynamicGitRepository: False
2019-08-06 22:18:56		INFO [08/06/19 22:18:56:41] Returning Project Root from DotGitDirectory: /Users/sboardwell/projects/my-company/my-project/.git - /Users/sboardwell/projects/my-company/my-project
2019-08-06 22:18:56		INFO [08/06/19 22:18:56:44] IsDynamicGitRepository: False
2019-08-06 22:18:56		INFO [08/06/19 22:18:56:44] Returning Project Root from DotGitDirectory: /Users/sboardwell/projects/my-company/my-project/.git - /Users/sboardwell/projects/my-company/my-project
2019-08-06 22:18:56		INFO [08/06/19 22:18:56:53] Using latest commit on specified branch
2019-08-06 22:18:56		INFO [08/06/19 22:18:56:54] No branch configuration found for branch move-fetch-tags-to-gitversion-block, falling back to default configuration
2019-08-06 22:18:56		INFO [08/06/19 22:18:56:54] Begin: Attempting to inherit branch configuration from parent branch
2019-08-06 22:18:56		  INFO [08/06/19 22:18:56:60] Begin: Finding branch source of 'move-fetch-tags-to-gitversion-block'
2019-08-06 22:18:56		    INFO [08/06/19 22:18:56:62] Begin: Finding merge base between 'move-fetch-tags-to-gitversion-block' and 'dev'.
2019-08-06 22:18:56		      INFO [08/06/19 22:18:56:63] Found merge base of b54ba7fe5e46fe2da2091afbfc061facf80f91e5
2019-08-06 22:18:56		      INFO [08/06/19 22:18:56:67] Merge base of move-fetch-tags-to-gitversion-block' and 'dev is b54ba7fe5e46fe2da2091afbfc061facf80f91e5
2019-08-06 22:18:56		    INFO [08/06/19 22:18:56:67] End: Finding merge base between 'move-fetch-tags-to-gitversion-block' and 'dev'. (Took: 42.48ms)
2019-08-06 22:18:56		    INFO [08/06/19 22:18:56:67] Begin: Finding merge base between 'move-fetch-tags-to-gitversion-block' and 'stable'.
2019-08-06 22:18:56		      INFO [08/06/19 22:18:56:67] Found merge base of 0bcfa2d4ffc4fafcca3a4b09ee80721ca7fccef9
2019-08-06 22:18:56		      INFO [08/06/19 22:18:56:67] Merge base of move-fetch-tags-to-gitversion-block' and 'stable is 0bcfa2d4ffc4fafcca3a4b09ee80721ca7fccef9
2019-08-06 22:18:56		    INFO [08/06/19 22:18:56:67] End: Finding merge base between 'move-fetch-tags-to-gitversion-block' and 'stable'. (Took: 1.71ms)
2019-08-06 22:18:56		    INFO [08/06/19 22:18:56:67] Begin: Finding merge base between 'move-fetch-tags-to-gitversion-block' and 'origin/dev'.
2019-08-06 22:18:56		      INFO [08/06/19 22:18:56:67] Found merge base of b54ba7fe5e46fe2da2091afbfc061facf80f91e5
2019-08-06 22:18:56		      INFO [08/06/19 22:18:56:67] Merge base of move-fetch-tags-to-gitversion-block' and 'origin/dev is b54ba7fe5e46fe2da2091afbfc061facf80f91e5
2019-08-06 22:18:56		    INFO [08/06/19 22:18:56:67] End: Finding merge base between 'move-fetch-tags-to-gitversion-block' and 'origin/dev'. (Took: 1.64ms)
2019-08-06 22:18:56		    INFO [08/06/19 22:18:56:67] Begin: Finding merge base between 'move-fetch-tags-to-gitversion-block' and 'origin/stable'.
2019-08-06 22:18:56		      INFO [08/06/19 22:18:56:67] Found merge base of 0bcfa2d4ffc4fafcca3a4b09ee80721ca7fccef9
2019-08-06 22:18:56		      INFO [08/06/19 22:18:56:67] Merge base of move-fetch-tags-to-gitversion-block' and 'origin/stable is 0bcfa2d4ffc4fafcca3a4b09ee80721ca7fccef9
2019-08-06 22:18:56		    INFO [08/06/19 22:18:56:67] End: Finding merge base between 'move-fetch-tags-to-gitversion-block' and 'origin/stable'. (Took: 1.69ms)
2019-08-06 22:18:56		    INFO [08/06/19 22:18:56:68] Multiple source branches have been found, picking the first one (dev).
This may result in incorrect commit counting.
Options were:
 dev, origin/dev, stable, origin/stable
2019-08-06 22:18:56		  INFO [08/06/19 22:18:56:68] End: Finding branch source of 'move-fetch-tags-to-gitversion-block' (Took: 84.78ms)
2019-08-06 22:18:56		  INFO [08/06/19 22:18:56:68] Begin: Getting branches containing the commit 'b54ba7fe5e46fe2da2091afbfc061facf80f91e5'.
2019-08-06 22:18:56		    INFO [08/06/19 22:18:56:68] Trying to find direct branches.
2019-08-06 22:18:56		    INFO [08/06/19 22:18:56:68] Direct branch found: 'dev'.
2019-08-06 22:18:56		  INFO [08/06/19 22:18:56:68] End: Getting branches containing the commit 'b54ba7fe5e46fe2da2091afbfc061facf80f91e5'. (Took: 1.75ms)
2019-08-06 22:18:56		  INFO [08/06/19 22:18:56:68] Found possible parent branches: dev
2019-08-06 22:18:56		INFO [08/06/19 22:18:56:68] End: Attempting to inherit branch configuration from parent branch (Took: 145.91ms)
2019-08-06 22:18:56		INFO [08/06/19 22:18:56:78] Running against branch: move-fetch-tags-to-gitversion-block (b29678a5423c578e8440f7918d559120017cd7f0)
2019-08-06 22:18:56		INFO [08/06/19 22:18:56:79] Begin: Calculating base versions
2019-08-06 22:18:56		  INFO [08/06/19 22:18:56:80] Fallback base version: 0.1.0 with commit count source 742c2fe8533ce51739dcaef50df4f2be96555e1d (Incremented: None)
2019-08-06 22:18:57		  INFO [08/06/19 22:18:57:14] Git tag 'v0.1.0': 0.1.0 with commit count source 0bcfa2d4ffc4fafcca3a4b09ee80721ca7fccef9 (Incremented: 0.2.0)
2019-08-06 22:18:57		  INFO [08/06/19 22:18:57:16] Merge message 'Merge branch 'release-0.1.0'': 0.1.0 with commit count source 0bcfa2d4ffc4fafcca3a4b09ee80721ca7fccef9 (Incremented: 0.2.0)
2019-08-06 22:18:57		  INFO [08/06/19 22:18:57:40] Found multiple base versions which will produce the same SemVer (0.2.0), taking oldest source for commit counting (Merge message 'Merge branch 'release-0.1.0'')
2019-08-06 22:18:57		  INFO [08/06/19 22:18:57:40] Base version used: Merge message 'Merge branch 'release-0.1.0'': 0.1.0 with commit count source 0bcfa2d4ffc4fafcca3a4b09ee80721ca7fccef9 (Incremented: 0.2.0)
2019-08-06 22:18:57		INFO [08/06/19 22:18:57:40] End: Calculating base versions (Took: 612.83ms)
2019-08-06 22:18:57		INFO [08/06/19 22:18:57:40] 52 commits found between 0bcfa2d4ffc4fafcca3a4b09ee80721ca7fccef9 and b29678a5423c578e8440f7918d559120017cd7f0
2019-08-06 22:18:57		INFO [08/06/19 22:18:57:40] Using branch name to calculate version tag
2019-08-06 22:18:57		INFO [08/06/19 22:18:57:40] Begin: Getting version tags from branch 'refs/heads/move-fetch-tags-to-gitversion-block'.
2019-08-06 22:18:57		INFO [08/06/19 22:18:57:62] End: Getting version tags from branch 'refs/heads/move-fetch-tags-to-gitversion-block'. (Took: 218.79ms)

The 4.0 docker image:

2019-08-06 20:58:32		INFO [08/06/19 20:58:32:93] Working directory: /repo
2019-08-06 20:58:32		INFO [08/06/19 20:58:32:97] IsDynamicGitRepository: False
2019-08-06 20:58:33		INFO [08/06/19 20:58:33:05] Returning Project Root from DotGitDirectory: /repo/.git - /repo
2019-08-06 20:58:33		INFO [08/06/19 20:58:33:06] Running on Mono.
2019-08-06 20:58:33		INFO [08/06/19 20:58:33:07] IsDynamicGitRepository: False
2019-08-06 20:58:33		INFO [08/06/19 20:58:33:08] Returning Project Root from DotGitDirectory: /repo/.git - /repo
2019-08-06 20:58:33		INFO [08/06/19 20:58:33:08] Project root is: /repo
2019-08-06 20:58:33		INFO [08/06/19 20:58:33:09] DotGit directory is: /repo/.git
2019-08-06 20:58:40		INFO [08/06/19 20:58:40:67] IsDynamicGitRepository: False
2019-08-06 20:58:40		INFO [08/06/19 20:58:40:68] Returning Project Root from DotGitDirectory: /repo/.git - /repo
2019-08-06 20:58:40		INFO [08/06/19 20:58:40:85] IsDynamicGitRepository: False
2019-08-06 20:58:40		INFO [08/06/19 20:58:40:86] Returning Project Root from DotGitDirectory: /repo/.git - /repo
2019-08-06 20:58:41		INFO [08/06/19 20:58:41:21] Using latest commit on specified branch
2019-08-06 20:58:41		INFO [08/06/19 20:58:41:29] No branch configuration found for branch move-fetch-tags-to-gitversion-block, falling back to default configuration
2019-08-06 20:58:41		INFO [08/06/19 20:58:41:30] Begin: Attempting to inherit branch configuration from parent branch
2019-08-06 20:58:45		  INFO [08/06/19 20:58:45:80] Begin: Finding branch source of 'move-fetch-tags-to-gitversion-block'
2019-08-06 20:58:47		    INFO [08/06/19 20:58:47:60] Begin: Finding merge base between 'move-fetch-tags-to-gitversion-block' and 'dev'.
2019-08-06 20:58:47		      INFO [08/06/19 20:58:47:63] Found merge base of b54ba7fe5e46fe2da2091afbfc061facf80f91e5
2019-08-06 20:58:47		      INFO [08/06/19 20:58:47:67] Merge base of move-fetch-tags-to-gitversion-block' and 'dev is b54ba7fe5e46fe2da2091afbfc061facf80f91e5
2019-08-06 20:58:47		    INFO [08/06/19 20:58:47:68] End: Finding merge base between 'move-fetch-tags-to-gitversion-block' and 'dev'. (Took: 72.07ms)
2019-08-06 20:58:47		    INFO [08/06/19 20:58:47:68] Begin: Finding merge base between 'move-fetch-tags-to-gitversion-block' and 'stable'.
2019-08-06 20:58:47		      INFO [08/06/19 20:58:47:72] Found merge base of 0bcfa2d4ffc4fafcca3a4b09ee80721ca7fccef9
2019-08-06 20:58:47		      INFO [08/06/19 20:58:47:73] Merge base of move-fetch-tags-to-gitversion-block' and 'stable is 0bcfa2d4ffc4fafcca3a4b09ee80721ca7fccef9
2019-08-06 20:58:47		    INFO [08/06/19 20:58:47:73] End: Finding merge base between 'move-fetch-tags-to-gitversion-block' and 'stable'. (Took: 45.94ms)
2019-08-06 20:58:47		    INFO [08/06/19 20:58:47:73] Begin: Finding merge base between 'move-fetch-tags-to-gitversion-block' and 'origin/dev'.
2019-08-06 20:58:47		      INFO [08/06/19 20:58:47:74] Found merge base of b54ba7fe5e46fe2da2091afbfc061facf80f91e5
2019-08-06 20:58:47		      INFO [08/06/19 20:58:47:74] Merge base of move-fetch-tags-to-gitversion-block' and 'origin/dev is b54ba7fe5e46fe2da2091afbfc061facf80f91e5
2019-08-06 20:58:47		    INFO [08/06/19 20:58:47:75] End: Finding merge base between 'move-fetch-tags-to-gitversion-block' and 'origin/dev'. (Took: 13.50ms)
2019-08-06 20:58:47		    INFO [08/06/19 20:58:47:75] Begin: Finding merge base between 'move-fetch-tags-to-gitversion-block' and 'origin/stable'.
2019-08-06 20:58:47		      INFO [08/06/19 20:58:47:76] Found merge base of 0bcfa2d4ffc4fafcca3a4b09ee80721ca7fccef9
2019-08-06 20:58:47		      INFO [08/06/19 20:58:47:76] Merge base of move-fetch-tags-to-gitversion-block' and 'origin/stable is 0bcfa2d4ffc4fafcca3a4b09ee80721ca7fccef9
2019-08-06 20:58:47		    INFO [08/06/19 20:58:47:77] End: Finding merge base between 'move-fetch-tags-to-gitversion-block' and 'origin/stable'. (Took: 17.11ms)
2019-08-06 20:58:47		    INFO [08/06/19 20:58:47:80] Multiple source branches have been found, picking the first one (dev).
This may result in incorrect commit counting.
Options were:
 dev, origin/dev, stable, origin/stable
2019-08-06 20:58:47		  INFO [08/06/19 20:58:47:80] End: Finding branch source of 'move-fetch-tags-to-gitversion-block' (Took: 2,002.08ms)
2019-08-06 20:58:47		  INFO [08/06/19 20:58:47:81] Begin: Getting branches containing the commit 'b54ba7fe5e46fe2da2091afbfc061facf80f91e5'.
2019-08-06 20:58:47		    INFO [08/06/19 20:58:47:81] Trying to find direct branches.
2019-08-06 20:58:47		    INFO [08/06/19 20:58:47:82] Direct branch found: 'dev'.
2019-08-06 20:58:47		  INFO [08/06/19 20:58:47:83] End: Getting branches containing the commit 'b54ba7fe5e46fe2da2091afbfc061facf80f91e5'. (Took: 20.17ms)
2019-08-06 20:58:47		  INFO [08/06/19 20:58:47:83] Found possible parent branches: dev
2019-08-06 20:58:47		INFO [08/06/19 20:58:47:84] End: Attempting to inherit branch configuration from parent branch (Took: 6,536.37ms)
2019-08-06 20:58:51		INFO [08/06/19 20:58:51:83] Running against branch: move-fetch-tags-to-gitversion-block (b29678a5423c578e8440f7918d559120017cd7f0)
2019-08-06 20:58:51		INFO [08/06/19 20:58:51:85] Begin: Calculating base versions
2019-08-06 20:58:51		  INFO [08/06/19 20:58:51:97] Fallback base version: 0.1.0 with commit count source 742c2fe8533ce51739dcaef50df4f2be96555e1d (Incremented: None)
2019-08-06 20:58:56		  INFO [08/06/19 20:58:56:36] Git tag 'v0.1.0': 0.1.0 with commit count source 0bcfa2d4ffc4fafcca3a4b09ee80721ca7fccef9 (Incremented: 0.2.0)
2019-08-06 20:58:56		  INFO [08/06/19 20:58:56:45] Merge message 'Merge branch 'release-0.1.0'': 0.1.0 with commit count source 0bcfa2d4ffc4fafcca3a4b09ee80721ca7fccef9 (Incremented: 0.2.0)
2019-08-06 20:59:02		  INFO [08/06/19 20:59:02:48] Found multiple base versions which will produce the same SemVer (0.2.0), taking oldest source for commit counting (Merge message 'Merge branch 'release-0.1.0'')
2019-08-06 20:59:02		  INFO [08/06/19 20:59:02:49] Base version used: Merge message 'Merge branch 'release-0.1.0'': 0.1.0 with commit count source 0bcfa2d4ffc4fafcca3a4b09ee80721ca7fccef9 (Incremented: 0.2.0)
2019-08-06 20:59:02		INFO [08/06/19 20:59:02:49] End: Calculating base versions (Took: 10,636.24ms)
2019-08-06 20:59:02		INFO [08/06/19 20:59:02:51] 52 commits found between 0bcfa2d4ffc4fafcca3a4b09ee80721ca7fccef9 and b29678a5423c578e8440f7918d559120017cd7f0
2019-08-06 20:59:02		INFO [08/06/19 20:59:02:52] Using branch name to calculate version tag
2019-08-06 20:59:02		INFO [08/06/19 20:59:02:52] Begin: Getting version tags from branch 'refs/heads/move-fetch-tags-to-gitversion-block'.
2019-08-06 20:59:07		INFO [08/06/19 20:59:07:08] End: Getting version tags from branch 'refs/heads/move-fetch-tags-to-gitversion-block'. (Took: 4,555.42ms)

The 5.0.x docker image:

2019-08-06 19:27:04		INFO [08/06/19 19:27:04:85] Working directory: /home/jenkins/workspace/europa_PR-1512
2019-08-06 19:27:04		INFO [08/06/19 19:27:04:85] IsDynamicGitRepository: False
2019-08-06 19:27:04		INFO [08/06/19 19:27:04:87] Returning Project Root from DotGitDirectory: /home/jenkins/workspace/europa_PR-1512/.git - /home/jenkins/workspace/europa_PR-1512
2019-08-06 19:27:04		INFO [08/06/19 19:27:04:87] Running on Windows.
2019-08-06 19:27:04		INFO [08/06/19 19:27:04:88] Applicable build agent found: 'Jenkins'.
2019-08-06 19:27:04		INFO [08/06/19 19:27:04:88] Branch from build environment:
2019-08-06 19:27:04		INFO [08/06/19 19:27:04:88] Begin: Normalizing git directory for branch ''
2019-08-06 19:27:04		  INFO [08/06/19 19:27:04:93] One remote found (origin -> 'https://github.com/Datameer-Inc/europa.git').
2019-08-06 19:27:04		  INFO [08/06/19 19:27:04:95] Skipping fetching, if GitVersion does not calculate your version as expected you might need to allow fetching or use dynamic repositories
2019-08-06 19:27:04		  INFO [08/06/19 19:27:04:98] Skipping update of 'refs/remotes/origin/dev' as it already matches the remote ref.
2019-08-06 19:27:04		  INFO [08/06/19 19:27:04:99] Skipping update of 'refs/remotes/origin/move-fetch-tags-to-gitversion-block' as it already matches the remote ref.
2019-08-06 19:27:05		  INFO [08/06/19 19:27:05:00] Skipping update of 'refs/remotes/origin/stable' as it already matches the remote ref.
2019-08-06 19:27:05		  INFO [08/06/19 19:27:05:00] HEAD points at branch 'refs/heads/PR-1512'.
2019-08-06 19:27:05		  INFO [08/06/19 19:27:05:00] End: Normalizing git directory for branch '' (Took: 123.33ms)
2019-08-06 19:27:05		  INFO [08/06/19 19:27:05:00] IsDynamicGitRepository: False
2019-08-06 19:27:05		  INFO [08/06/19 19:27:05:00] Returning Project Root from DotGitDirectory: /home/jenkins/workspace/europa_PR-1512/.git - /home/jenkins/workspace/europa_PR-1512
2019-08-06 19:27:05		  INFO [08/06/19 19:27:05:00] Project root is: /home/jenkins/workspace/europa_PR-1512
2019-08-06 19:27:05		  INFO [08/06/19 19:27:05:00] DotGit directory is: /home/jenkins/workspace/europa_PR-1512/.git
2019-08-06 19:27:05		  INFO [08/06/19 19:27:05:05] IsDynamicGitRepository: False
2019-08-06 19:27:05		  INFO [08/06/19 19:27:05:05] Returning Project Root from DotGitDirectory: /home/jenkins/workspace/europa_PR-1512/.git - /home/jenkins/workspace/europa_PR-1512
2019-08-06 19:27:05		  INFO [08/06/19 19:27:05:05] IsDynamicGitRepository: False
2019-08-06 19:27:05		  INFO [08/06/19 19:27:05:05] Returning Project Root from DotGitDirectory: /home/jenkins/workspace/europa_PR-1512/.git - /home/jenkins/workspace/europa_PR-1512
2019-08-06 19:27:05		  INFO [08/06/19 19:27:05:23] Using latest commit on specified branch
2019-08-06 19:27:05		  INFO [08/06/19 19:27:05:26] Begin: Attempting to inherit branch configuration from parent branch
2019-08-06 19:27:05		    INFO [08/06/19 19:27:05:29] Begin: Finding branch source of 'PR-1512'
2019-08-06 19:27:05		      INFO [08/06/19 19:27:05:33] Begin: Finding merge base between 'PR-1512' and 'dev'.
2019-08-06 19:27:05		        INFO [08/06/19 19:27:05:34] Found merge base of b54ba7fe5e46fe2da2091afbfc061facf80f91e5
2019-08-06 19:27:05		        INFO [08/06/19 19:27:05:35] Merge base of PR-1512' and 'dev is b54ba7fe5e46fe2da2091afbfc061facf80f91e5
2019-08-06 19:27:05		      INFO [08/06/19 19:27:05:35] End: Finding merge base between 'PR-1512' and 'dev'. (Took: 26.87ms)
2019-08-06 19:27:05		      INFO [08/06/19 19:27:05:36] Begin: Finding merge base between 'PR-1512' and 'origin/stable'.
2019-08-06 19:27:05		        INFO [08/06/19 19:27:05:36] Found merge base of b54ba7fe5e46fe2da2091afbfc061facf80f91e5
2019-08-06 19:27:05		        INFO [08/06/19 19:27:05:36] Merge base of PR-1512' and 'origin/stable is b54ba7fe5e46fe2da2091afbfc061facf80f91e5
2019-08-06 19:27:05		      INFO [08/06/19 19:27:05:36] End: Finding merge base between 'PR-1512' and 'origin/stable'. (Took: 0.90ms)
2019-08-06 19:27:05		      INFO [08/06/19 19:27:05:36] Begin: Finding merge base between 'PR-1512' and 'stable'.
2019-08-06 19:27:05		        INFO [08/06/19 19:27:05:36] Found merge base of 0bcfa2d4ffc4fafcca3a4b09ee80721ca7fccef9
2019-08-06 19:27:05		        INFO [08/06/19 19:27:05:36] Merge base of PR-1512' and 'stable is 0bcfa2d4ffc4fafcca3a4b09ee80721ca7fccef9
2019-08-06 19:27:05		      INFO [08/06/19 19:27:05:36] End: Finding merge base between 'PR-1512' and 'stable'. (Took: 0.92ms)
2019-08-06 19:27:05		      INFO [08/06/19 19:27:05:36] Begin: Finding merge base between 'PR-1512' and 'origin/stable'.
2019-08-06 19:27:05		        INFO [08/06/19 19:27:05:36] Found merge base of 0bcfa2d4ffc4fafcca3a4b09ee80721ca7fccef9
2019-08-06 19:27:05		        INFO [08/06/19 19:27:05:36] Merge base of PR-1512' and 'origin/stable is 0bcfa2d4ffc4fafcca3a4b09ee80721ca7fccef9
2019-08-06 19:27:05		      INFO [08/06/19 19:27:05:36] End: Finding merge base between 'PR-1512' and 'origin/stable'. (Took: 0.30ms)
2019-08-06 19:27:05		      INFO [08/06/19 19:27:05:38] Multiple source branches have been found, picking the first one (dev).
This may result in incorrect commit counting.
Options were:
 dev, origin/stable, stable, origin/stable
2019-08-06 19:27:05		    INFO [08/06/19 19:27:05:38] End: Finding branch source of 'PR-1512' (Took: 83.23ms)
2019-08-06 19:27:05		    INFO [08/06/19 19:27:05:38] Begin: Getting branches containing the commit 'b54ba7fe5e46fe2da2091afbfc061facf80f91e5'.
2019-08-06 19:27:05		      INFO [08/06/19 19:27:05:38] Trying to find direct branches.
2019-08-06 19:27:05		      INFO [08/06/19 19:27:05:38] No direct branches found, searching through tracked branches.
2019-08-06 19:27:05		      INFO [08/06/19 19:27:05:38] Searching for commits reachable from 'origin/stable'.
2019-08-06 19:27:05		      INFO [08/06/19 19:27:05:39] The branch 'origin/stable' has a matching commit.
2019-08-06 19:27:05		      INFO [08/06/19 19:27:05:39] Searching for commits reachable from 'stable'.
2019-08-06 19:27:05		      INFO [08/06/19 19:27:05:41] The branch 'stable' has no matching commits.
2019-08-06 19:27:05		      INFO [08/06/19 19:27:05:41] Searching for commits reachable from 'origin/dev'.
2019-08-06 19:27:05		      INFO [08/06/19 19:27:05:41] The branch 'origin/dev' has a matching commit.
2019-08-06 19:27:05		      INFO [08/06/19 19:27:05:41] Searching for commits reachable from 'origin/stable'.
2019-08-06 19:27:05		      INFO [08/06/19 19:27:05:44] The branch 'origin/stable' has no matching commits.
2019-08-06 19:27:05		    INFO [08/06/19 19:27:05:44] End: Getting branches containing the commit 'b54ba7fe5e46fe2da2091afbfc061facf80f91e5'. (Took: 59.17ms)
2019-08-06 19:27:05		    INFO [08/06/19 19:27:05:44] Begin: Getting branches containing the commit 'b29678a5423c578e8440f7918d559120017cd7f0'.
2019-08-06 19:27:05		      INFO [08/06/19 19:27:05:44] Trying to find direct branches.
2019-08-06 19:27:05		      INFO [08/06/19 19:27:05:44] No direct branches found, searching through tracked branches.
2019-08-06 19:27:05		      INFO [08/06/19 19:27:05:44] Searching for commits reachable from 'origin/stable'.
2019-08-06 19:27:05		      INFO [08/06/19 19:27:05:47] The branch 'origin/stable' has no matching commits.
2019-08-06 19:27:05		      INFO [08/06/19 19:27:05:47] Searching for commits reachable from 'stable'.
2019-08-06 19:27:05		      INFO [08/06/19 19:27:05:49] The branch 'stable' has no matching commits.
2019-08-06 19:27:05		      INFO [08/06/19 19:27:05:49] Searching for commits reachable from 'origin/dev'.
2019-08-06 19:27:05		      INFO [08/06/19 19:27:05:51] The branch 'origin/dev' has no matching commits.
2019-08-06 19:27:05		      INFO [08/06/19 19:27:05:51] Searching for commits reachable from 'origin/stable'.
2019-08-06 19:27:05		      INFO [08/06/19 19:27:05:54] The branch 'origin/stable' has no matching commits.
2019-08-06 19:27:05		    INFO [08/06/19 19:27:05:54] End: Getting branches containing the commit 'b29678a5423c578e8440f7918d559120017cd7f0'. (Took: 98.10ms)
2019-08-06 19:27:05		    INFO [08/06/19 19:27:05:54] Found possible parent branches: origin/stable, origin/dev
2019-08-06 19:27:05		    WARN [08/06/19 19:27:05:55] Failed to inherit Increment branch configuration, ended up with: origin/stable, origin/dev

Falling back to dev branch config
2019-08-06 19:27:05		  INFO [08/06/19 19:27:05:56] End: Attempting to inherit branch configuration from parent branch (Took: 299.16ms)
2019-08-06 19:27:05		  INFO [08/06/19 19:27:05:64] Running against branch: PR-1512 (b29678a5423c578e8440f7918d559120017cd7f0)
2019-08-06 19:27:05		  INFO [08/06/19 19:27:05:65] Begin: Calculating base versions
2019-08-06 19:27:05		    INFO [08/06/19 19:27:05:69] Fallback base version: 0.1.0 with commit count source 742c2fe8533ce51739dcaef50df4f2be96555e1d (Incremented: None)
2019-08-06 19:27:06		    INFO [08/06/19 19:27:06:20] Git tag 'v0.1.0': 0.1.0 with commit count source 0bcfa2d4ffc4fafcca3a4b09ee80721ca7fccef9 (Incremented: 0.2.0)
2019-08-06 19:27:06		    INFO [08/06/19 19:27:06:33] Merge message 'Merge branch 'release-0.1.0'': 0.1.0 with commit count source 0bcfa2d4ffc4fafcca3a4b09ee80721ca7fccef9 (Incremented: 0.2.0)
2019-08-06 19:27:06		    INFO [08/06/19 19:27:06:40] Found multiple base versions which will produce the same SemVer (0.2.0), taking oldest source for commit counting (Merge message 'Merge branch 'release-0.1.0'')
2019-08-06 19:27:06		    INFO [08/06/19 19:27:06:42] Base version used: Merge message 'Merge branch 'release-0.1.0'': 0.1.0 with commit count source 49af1444722302a6ff4a16e97d59bec5745bf052 (Incremented: 0.2.0)
2019-08-06 19:27:06		  INFO [08/06/19 19:27:06:42] End: Calculating base versions (Took: 776.45ms)
2019-08-06 19:27:06		  INFO [08/06/19 19:27:06:46] 1374 commits found between 49af1444722302a6ff4a16e97d59bec5745bf052 and b29678a5423c578e8440f7918d559120017cd7f0
2019-08-06 19:27:06		  INFO [08/06/19 19:27:06:46] Begin: Getting version tags from branch 'refs/heads/PR-1512'.
2019-08-06 19:27:06		  INFO [08/06/19 19:27:06:83] End: Getting version tags from branch 'refs/heads/PR-1512'. (Took: 363.86ms)

[Skoucail]

Seems the issue is unrelated to linux.
I guess this is just a bug in version 5.0.X.
I have the same problem on my windows DevOps agents.

For some reason it takes an older commit to start counting.
While the logging shows it finds the newer release commit.

@ruhullahshah is it possible the changes you did cause this?

2019-08-28T12:53:57.4175523Z ##[section]Starting: GitVersion
2019-08-28T12:53:57.4184042Z ==============================================================================
2019-08-28T12:53:57.4184187Z Task         : GitVersion Task
2019-08-28T12:53:57.4184290Z Description  : Easy Semantic Versioning (http://semver.org) for projects using Git
2019-08-28T12:53:57.4184384Z Version      : 5.0.1
2019-08-28T12:53:57.4184490Z Author       : GitVersion Contributors
2019-08-28T12:53:57.4184588Z Help         : See the [documentation](http://gitversion.readthedocs.org/en/latest/) for help
2019-08-28T12:53:57.4184703Z ==============================================================================
2019-08-28T12:53:58.0941738Z [command]"C:\Program Files\dotnet\dotnet.exe" D:\azagent1\_work\_tasks\GitVersion_e5983830-3f75-11e5-82ed-81492570a08e\5.0.1\core\GitVersion.dll D:\azagent1\_work\13\s /output buildserver /nofetch /config D:\azagent1\_work\13\s\GitVersion.yml /updateassemblyinfo true
2019-08-28T12:53:58.7279923Z INFO [08/28/19 14:53:58:71] Working directory: D:\azagent1\_work\13\s
2019-08-28T12:53:58.7291099Z INFO [08/28/19 14:53:58:72] IsDynamicGitRepository: False
2019-08-28T12:53:58.8609564Z INFO [08/28/19 14:53:58:86] Returning Project Root from DotGitDirectory: D:\azagent1\_work\13\s\.git - D:\azagent1\_work\13\s
2019-08-28T12:53:58.8644207Z INFO [08/28/19 14:53:58:86] Running on Windows.
2019-08-28T12:53:58.8707961Z INFO [08/28/19 14:53:58:87] Applicable build agent found: 'VsoAgent'.
2019-08-28T12:53:58.8721766Z INFO [08/28/19 14:53:58:87] Branch from build environment: refs/heads/develop
2019-08-28T12:53:58.8734226Z INFO [08/28/19 14:53:58:87] Begin: Normalizing git directory for branch 'refs/heads/develop'
2019-08-28T12:53:58.9742642Z   INFO [08/28/19 14:53:58:96] One remote found (origin -> 'xxx').
2019-08-28T12:53:58.9796544Z   INFO [08/28/19 14:53:58:97] Skipping fetching, if GitVersion does not calculate your version as expected you might need to allow fetching or use dynamic repositories
2019-08-28T12:53:59.0232536Z   INFO [08/28/19 14:53:59:02] Creating local branch refs/heads/develop
2019-08-28T12:53:59.1167630Z   INFO [08/28/19 14:53:59:11] Creating local branch from remote tracking 'refs/remotes/origin/codescreening'.
2019-08-28T12:53:59.1863957Z   INFO [08/28/19 14:53:59:18] Creating local branch from remote tracking 'refs/remotes/origin/DVW'.
2019-08-28T12:53:59.2280402Z   INFO [08/28/19 14:53:59:22] Creating local branch from remote tracking 'refs/remotes/origin/master'.
2019-08-28T12:53:59.2519790Z   INFO [08/28/19 14:53:59:25] HEAD points at branch 'refs/heads/develop'.
2019-08-28T12:53:59.2550273Z   INFO [08/28/19 14:53:59:25] End: Normalizing git directory for branch 'refs/heads/develop' (Took: 381.54ms)
2019-08-28T12:53:59.2551662Z   INFO [08/28/19 14:53:59:25] IsDynamicGitRepository: False
2019-08-28T12:53:59.2553066Z   INFO [08/28/19 14:53:59:25] Returning Project Root from DotGitDirectory: D:\azagent1\_work\13\s\.git - D:\azagent1\_work\13\s
2019-08-28T12:53:59.2553267Z   INFO [08/28/19 14:53:59:25] Project root is: D:\azagent1\_work\13\s
2019-08-28T12:53:59.2557126Z   INFO [08/28/19 14:53:59:25] DotGit directory is: D:\azagent1\_work\13\s\.git
2019-08-28T12:53:59.3334069Z   INFO [08/28/19 14:53:59:33] IsDynamicGitRepository: False
2019-08-28T12:53:59.3335030Z   INFO [08/28/19 14:53:59:33] Returning Project Root from DotGitDirectory: D:\azagent1\_work\13\s\.git - D:\azagent1\_work\13\s
2019-08-28T12:53:59.3430414Z   INFO [08/28/19 14:53:59:34] Begin: Loading version variables from disk cache
2019-08-28T12:53:59.3445989Z     INFO [08/28/19 14:53:59:34] Cache file D:\azagent1\_work\13\s\.git\gitversion_cache\75DBDB9C3AA44AFAD62C69C98105DB50645A7C16.yml not found.
2019-08-28T12:53:59.3446852Z   INFO [08/28/19 14:53:59:34] End: Loading version variables from disk cache (Took: 1.59ms)
2019-08-28T12:53:59.3454506Z   INFO [08/28/19 14:53:59:34] IsDynamicGitRepository: False
2019-08-28T12:53:59.3455917Z   INFO [08/28/19 14:53:59:34] Returning Project Root from DotGitDirectory: D:\azagent1\_work\13\s\.git - D:\azagent1\_work\13\s
2019-08-28T12:53:59.6643547Z   INFO [08/28/19 14:53:59:66] Using latest commit on specified branch
2019-08-28T12:53:59.7217692Z   INFO [08/28/19 14:53:59:72] Running against branch: develop (2dc9386f58d5e4a873a4c19be59b2e98baf85ec3)
2019-08-28T12:53:59.7302182Z   INFO [08/28/19 14:53:59:73] Begin: Calculating base versions
2019-08-28T12:53:59.9193480Z     INFO [08/28/19 14:53:59:91] Fallback base version: 0.1.0 with commit count source dffea978b1f79c70d2bf161ceca30bce59dad2c5 (Incremented: None)
2019-08-28T12:54:00.3640945Z     INFO [08/28/19 14:54:00:36] Git tag '2.12.0': 2.12.0 with commit count source 3c638342e70f01f04e9d4dee8958666e994215bf (Incremented: 2.13.0)
2019-08-28T12:54:00.3860555Z     INFO [08/28/19 14:54:00:38] Git tag '2.11.0': 2.11.0 with commit count source b06360832980a37d4138983fba30e565daab2b01 (Incremented: 2.12.0)
2019-08-28T12:54:00.4081871Z     INFO [08/28/19 14:54:00:40] Git tag '2.10.0': 2.10.0 with commit count source 0d015c78ec23af7fb333b90c13075619fd412421 (Incremented: 2.11.0)
2019-08-28T12:54:00.4306566Z     INFO [08/28/19 14:54:00:43] Git tag '2.9.0': 2.9.0 with commit count source 7ef627e8e216bb496e46591712c150e39d79749d (Incremented: 2.10.0)
2019-08-28T12:54:00.4527686Z     INFO [08/28/19 14:54:00:45] Git tag '2.8.1': 2.8.1 with commit count source 1e91fcd2bfd4274ccfb8c5370b304793514ab409 (Incremented: 2.9.0)
2019-08-28T12:54:00.4749562Z     INFO [08/28/19 14:54:00:47] Git tag '2.7.0': 2.7.0 with commit count source 288d38173e008ec8b39b70b48b3257ca99d33fc1 (Incremented: 2.8.0)
2019-08-28T12:54:00.4971007Z     INFO [08/28/19 14:54:00:49] Git tag '2.6.1': 2.6.1 with commit count source 684e9c13dbcb00f5c54a20358162e1f778353de5 (Incremented: 2.7.0)
2019-08-28T12:54:00.5192715Z     INFO [08/28/19 14:54:00:51] Git tag '2.5.2': 2.5.2 with commit count source 67b629a210c098fbe8b3c61b3e8840d8f7f1ca9f (Incremented: 2.6.0)
2019-08-28T12:54:00.5414144Z     INFO [08/28/19 14:54:00:54] Git tag '2.5.1': 2.5.1 with commit count source e0470f632f4cbaaddfc28a8402475fd6bec49cfd (Incremented: 2.6.0)
2019-08-28T12:54:00.5636214Z     INFO [08/28/19 14:54:00:56] Git tag '2.5.0': 2.5.0 with commit count source ada018bfd9170c53283fc6df474ad4b03b467426 (Incremented: 2.6.0)
2019-08-28T12:54:00.6285267Z     INFO [08/28/19 14:54:00:62] Git tag '2.4': 2.4.0 with commit count source 2d9f158ca3cecd289cd22fff0704d1af718d1a07 (Incremented: 2.5.0)
2019-08-28T12:54:00.6505917Z     INFO [08/28/19 14:54:00:65] Git tag '2.3.1': 2.3.1 with commit count source 7e298eb77b755f2676d0a78833aee4a282fa2603 (Incremented: 2.4.0)
2019-08-28T12:54:00.6731647Z     INFO [08/28/19 14:54:00:67] Git tag '2.3.0': 2.3.0 with commit count source 2d226202c25f1836a70b23dfc56cf5b18deb1b6b (Incremented: 2.4.0)
2019-08-28T12:54:00.6961271Z     INFO [08/28/19 14:54:00:69] Git tag '2.2.0': 2.2.0 with commit count source a771699e666c173400ffb21dc36cc96f2c03a69b (Incremented: 2.3.0)
2019-08-28T12:54:00.7176957Z     INFO [08/28/19 14:54:00:71] Git tag '2.0.2': 2.0.2 with commit count source fee8318892a489765034080badf763a00cfb0b3f (Incremented: 2.1.0)
2019-08-28T12:54:00.7397121Z     INFO [08/28/19 14:54:00:73] Git tag '2.0.1': 2.0.1 with commit count source 96425f095354507a37301244543d81442dacf485 (Incremented: 2.1.0)
2019-08-28T12:54:00.8590380Z     INFO [08/28/19 14:54:00:85] Found commit [2dc9386f58d5e4a873a4c19be59b2e98baf85ec3] matching merge message format: Default
2019-08-28T12:54:00.8591650Z     INFO [08/28/19 14:54:00:85] Found commit [2dc9386f58d5e4a873a4c19be59b2e98baf85ec3] matching merge message format: Default
2019-08-28T12:54:00.8595017Z     INFO [08/28/19 14:54:00:85] Found commit [2dc9386f58d5e4a873a4c19be59b2e98baf85ec3] matching merge message format: Default
2019-08-28T12:54:00.8596673Z     INFO [08/28/19 14:54:00:85] Found commit [2dc9386f58d5e4a873a4c19be59b2e98baf85ec3] matching merge message format: Default
2019-08-28T12:54:00.8600013Z     INFO [08/28/19 14:54:00:85] Found commit [2dc9386f58d5e4a873a4c19be59b2e98baf85ec3] matching merge message format: Default
2019-08-28T12:54:00.8605969Z     INFO [08/28/19 14:54:00:86] Found commit [2dc9386f58d5e4a873a4c19be59b2e98baf85ec3] matching merge message format: Default
2019-08-28T12:54:00.8608352Z     INFO [08/28/19 14:54:00:86] Found commit [2dc9386f58d5e4a873a4c19be59b2e98baf85ec3] matching merge message format: Default
2019-08-28T12:54:00.8611224Z     INFO [08/28/19 14:54:00:86] Found commit [2dc9386f58d5e4a873a4c19be59b2e98baf85ec3] matching merge message format: Default
2019-08-28T12:54:00.8612826Z     INFO [08/28/19 14:54:00:86] Found commit [2dc9386f58d5e4a873a4c19be59b2e98baf85ec3] matching merge message format: Default
2019-08-28T12:54:00.8615254Z     INFO [08/28/19 14:54:00:86] Found commit [2dc9386f58d5e4a873a4c19be59b2e98baf85ec3] matching merge message format: Default
2019-08-28T12:54:01.0216325Z     INFO [08/28/19 14:54:01:02] Merge message 'Merge branch 'release/2.12'': 2.12.0 with commit count source 3c638342e70f01f04e9d4dee8958666e994215bf (Incremented: 2.13.0)
2019-08-28T12:54:01.0437349Z     INFO [08/28/19 14:54:01:04] Merge message 'Merge branch 'release/2.11'': 2.11.0 with commit count source b06360832980a37d4138983fba30e565daab2b01 (Incremented: 2.12.0)
2019-08-28T12:54:01.0658364Z     INFO [08/28/19 14:54:01:06] Merge message 'Merge branch 'release/2.10.0'': 2.10.0 with commit count source 0d015c78ec23af7fb333b90c13075619fd412421 (Incremented: 2.11.0)
2019-08-28T12:54:01.0879515Z     INFO [08/28/19 14:54:01:08] Merge message 'Merge branch 'release/2.9.0'': 2.9.0 with commit count source 7ef627e8e216bb496e46591712c150e39d79749d (Incremented: 2.10.0)
2019-08-28T12:54:01.1100820Z     INFO [08/28/19 14:54:01:10] Merge message 'Merge branch 'release/2.7.0'': 2.7.0 with commit count source 288d38173e008ec8b39b70b48b3257ca99d33fc1 (Incremented: 2.8.0)
2019-08-28T12:54:01.1322566Z     INFO [08/28/19 14:54:01:13] Merge message 'Merge branch 'release/2.5.0'': 2.5.0 with commit count source ada018bfd9170c53283fc6df474ad4b03b467426 (Incremented: 2.6.0)
2019-08-28T12:54:01.1545003Z     INFO [08/28/19 14:54:01:15] Merge message 'Merge branch 'release/2.4'': 2.4.0 with commit count source 2d9f158ca3cecd289cd22fff0704d1af718d1a07 (Incremented: 2.5.0)
2019-08-28T12:54:01.1767703Z     INFO [08/28/19 14:54:01:17] Merge message 'Merge branch 'release/2.3'': 2.3.0 with commit count source 2d226202c25f1836a70b23dfc56cf5b18deb1b6b (Incremented: 2.4.0)
2019-08-28T12:54:01.1990247Z     INFO [08/28/19 14:54:01:19] Merge message 'Merge branch 'release/2.2.0'': 2.2.0 with commit count source a771699e666c173400ffb21dc36cc96f2c03a69b (Incremented: 2.3.0)
2019-08-28T12:54:01.2214461Z     INFO [08/28/19 14:54:01:22] Merge message 'Merge branch 'release/2.1.0'': 2.1.0 with commit count source 96d9a0b47452b21a9bfbc15443b31c3a72cebb64 (Incremented: 2.2.0)
2019-08-28T12:54:01.4144865Z     INFO [08/28/19 14:54:01:41] Git tag '2.12.0': 2.12.0 with commit count source 3c638342e70f01f04e9d4dee8958666e994215bf (Incremented: 2.13.0)
2019-08-28T12:54:01.4375012Z     INFO [08/28/19 14:54:01:43] Git tag '2.11.0': 2.11.0 with commit count source b06360832980a37d4138983fba30e565daab2b01 (Incremented: 2.12.0)
2019-08-28T12:54:01.4595577Z     INFO [08/28/19 14:54:01:45] Git tag '2.10.0': 2.10.0 with commit count source 0d015c78ec23af7fb333b90c13075619fd412421 (Incremented: 2.11.0)
2019-08-28T12:54:01.4823680Z     INFO [08/28/19 14:54:01:48] Git tag '2.9.0': 2.9.0 with commit count source 7ef627e8e216bb496e46591712c150e39d79749d (Incremented: 2.10.0)
2019-08-28T12:54:01.5095180Z     INFO [08/28/19 14:54:01:50] Git tag '2.8.1': 2.8.1 with commit count source 1e91fcd2bfd4274ccfb8c5370b304793514ab409 (Incremented: 2.9.0)
2019-08-28T12:54:01.5314698Z     INFO [08/28/19 14:54:01:53] Git tag '2.7.0': 2.7.0 with commit count source 288d38173e008ec8b39b70b48b3257ca99d33fc1 (Incremented: 2.8.0)
2019-08-28T12:54:01.5535669Z     INFO [08/28/19 14:54:01:55] Git tag '2.6.1': 2.6.1 with commit count source 684e9c13dbcb00f5c54a20358162e1f778353de5 (Incremented: 2.7.0)
2019-08-28T12:54:01.5757401Z     INFO [08/28/19 14:54:01:57] Git tag '2.5.2': 2.5.2 with commit count source 67b629a210c098fbe8b3c61b3e8840d8f7f1ca9f (Incremented: 2.6.0)
2019-08-28T12:54:01.5978638Z     INFO [08/28/19 14:54:01:59] Git tag '2.5.1': 2.5.1 with commit count source e0470f632f4cbaaddfc28a8402475fd6bec49cfd (Incremented: 2.6.0)
2019-08-28T12:54:01.6200288Z     INFO [08/28/19 14:54:01:61] Git tag '2.5.0': 2.5.0 with commit count source ada018bfd9170c53283fc6df474ad4b03b467426 (Incremented: 2.6.0)
2019-08-28T12:54:01.6422482Z     INFO [08/28/19 14:54:01:64] Git tag '2.4': 2.4.0 with commit count source 2d9f158ca3cecd289cd22fff0704d1af718d1a07 (Incremented: 2.5.0)
2019-08-28T12:54:01.6644674Z     INFO [08/28/19 14:54:01:66] Git tag '2.3.1': 2.3.1 with commit count source 7e298eb77b755f2676d0a78833aee4a282fa2603 (Incremented: 2.4.0)
2019-08-28T12:54:01.6867460Z     INFO [08/28/19 14:54:01:68] Git tag '2.3.0': 2.3.0 with commit count source 2d226202c25f1836a70b23dfc56cf5b18deb1b6b (Incremented: 2.4.0)
2019-08-28T12:54:01.7090007Z     INFO [08/28/19 14:54:01:70] Git tag '2.2.0': 2.2.0 with commit count source a771699e666c173400ffb21dc36cc96f2c03a69b (Incremented: 2.3.0)
2019-08-28T12:54:01.7312036Z     INFO [08/28/19 14:54:01:73] Git tag '2.0.2': 2.0.2 with commit count source fee8318892a489765034080badf763a00cfb0b3f (Incremented: 2.1.0)
2019-08-28T12:54:01.7535141Z     INFO [08/28/19 14:54:01:75] Git tag '2.0.1': 2.0.1 with commit count source 96425f095354507a37301244543d81442dacf485 (Incremented: 2.1.0)
2019-08-28T12:54:01.7915010Z     INFO [08/28/19 14:54:01:79] Found multiple base versions which will produce the same SemVer (2.13.0), taking oldest source for commit counting (Merge message 'Merge branch 'release/2.12'')
2019-08-28T12:54:01.8026708Z     INFO [08/28/19 14:54:01:80] Base version used: Merge message 'Merge branch 'release/2.12'': 2.12.0 with commit count source b06360832980a37d4138983fba30e565daab2b01 (Incremented: 2.13.0)
2019-08-28T12:54:01.8035282Z   INFO [08/28/19 14:54:01:80] End: Calculating base versions (Took: 2,072.49ms)
2019-08-28T12:54:01.8162075Z   INFO [08/28/19 14:54:01:81] 7 commits found between b06360832980a37d4138983fba30e565daab2b01 and 2dc9386f58d5e4a873a4c19be59b2e98baf85ec3
2019-08-28T12:54:01.8214255Z   INFO [08/28/19 14:54:01:82] Begin: Getting version tags from branch 'refs/heads/develop'.
2019-08-28T12:54:01.9669270Z   INFO [08/28/19 14:54:01:96] End: Getting version tags from branch 'refs/heads/develop'. (Took: 145.31ms)
2019-08-28T12:54:02.0065412Z   INFO [08/28/19 14:54:02:00] Begin: Creating dictionary
2019-08-28T12:54:02.0178473Z   INFO [08/28/19 14:54:02:01] End: Creating dictionary (Took: 11.41ms)
2019-08-28T12:54:02.0244275Z   INFO [08/28/19 14:54:02:02] Begin: Storing version variables to cache file D:\azagent1\_work\13\s\.git\gitversion_cache\75DBDB9C3AA44AFAD62C69C98105DB50645A7C16.yml
2019-08-28T12:54:02.1507934Z   INFO [08/28/19 14:54:02:15] End: Storing version variables to cache file D:\azagent1\_work\13\s\.git\gitversion_cache\75DBDB9C3AA44AFAD62C69C98105DB50645A7C16.yml (Took: 126.21ms)
2019-08-28T12:54:02.1546455Z   INFO [08/28/19 14:54:02:15] Applicable build agent found: 'VsoAgent'.
2019-08-28T12:54:02.1554390Z Executing GenerateSetVersionMessage for 'VsoAgent'.
2019-08-28T12:54:02.3730920Z Executing GenerateBuildLogOutput for 'VsoAgent'.
2019-08-28T12:54:02.3755840Z   INFO [08/28/19 14:54:02:16] Updating assembly info files
2019-08-28T12:54:02.3756047Z   INFO [08/28/19 14:54:02:19] Found 4 files
2019-08-28T12:54:02.3820633Z ##[section]Async Command Start: Update Build Number
2019-08-28T12:54:02.4562862Z Update build number to 2.13.0-alpha.7 for build 2164
2019-08-28T12:54:02.4563048Z ##[section]Async Command End: Update Build Number
2019-08-28T12:54:02.4564298Z ##[section]Finishing: GitVersion

[ruhullahshah]

@Skoucail Sorry, but for me to provide you with a concrete answer, could you please do one of the following instead of pasting a log:

1. Provide a sample(minimalistic) Git repo, and state the expected/actual output.
2. Provide a failing testcase in GitVersion on a feature branch

I am currently tight on time and won't be able to parse the logs.

[Skoucail]

Related topics: #1526. #1635 #1678

@ruhullahshah
I believe the problem is with the added function FixTheBaseVersionSourceOfMergeMessageStrategyIfReleaseBranchWasMergedAndDeleted

Consider this gitflow:
Working on a development branch.
Creating a release branch from the development branch called release/1.1.0
After the release is tested. We merge the release branch to master with (auto)commit message: Merge branch 'release/1.1.0'.
The master branch gets back-merged to develop.
During the merge the commit also gets tagged with 1.1.0 and the release branch is deleted.

Result:
Master branch 1 commit with message "Merge branch 'release/1.1.0'' and tag 1.1.0
Develop branch 2 commit: one with message "Merge branch 'release/1.1.0'' and tag 1.1.0
one with message "Merge tag '1.1.0' into develop"

Expected gitversion result: On master branch results in version 1.1.0.
On develop brach results in version 1.2.0-alpha.1 (one commit since last release

Actual gitversion result: On master branch results in version 1.1.0.
On develop branch results in version 1.2.0-alpha.8 (for example if 8 commit since version 1.0.0)

The reason is that the function FixTheBaseVersionSourceOfMergeMessageStrategyIfReleaseBranchWasMergedAndDeleted takes parents of the merge commit without considering this is the correct one...

Edit: I just found the integration tests, will try to make a use case.

[Skoucail]

I finally found out whats going wrong.
git flow tools/website use/describe 2 ways to do the flow.

Method 1:
The release branch gets merged into the master and the development branches.

Method 2:
The release branch gets merged into the master branch.
The master branch gets backmerged into the development branch. (for example 'git for windows' uses this method).

From what i know now. The change made in PR #1635 work if method 1 is used.
If method 2 is used the counting of the commits are just screwed.

I believe both ways of bringing the release to dev branch are valid and should give the same version result.

The test i used (swap able between the 2 methods by swapping comments):

public void CommitsSinceVersionSourceShouldResetUponGitFlowReleaseFinish()
{

	var config = new Config { VersioningMode = VersioningMode.ContinuousDeployment };
	using (var fixture = new EmptyRepositoryFixture()) {
		fixture.MakeATaggedCommit("1.1.0");
		fixture.BranchTo("develop");
		fixture.MakeACommit("commit in develop - 1");
		fixture.MakeACommit("commit in develop - 2");
		fixture.MakeACommit("commit in develop - 3");
		fixture.AssertFullSemver(config, "1.2.0-alpha.3");

		fixture.BranchTo("release/1.2.0");
		fixture.AssertFullSemver(config, "1.2.0-beta.0");
		fixture.MakeACommit("commit in release/1.2.0 - 1");
		fixture.AssertFullSemver(config, "1.2.0-beta.1");

		fixture.Checkout("master");
		fixture.MergeNoFF("release/1.2.0");
		fixture.ApplyTag("1.2.0");

		fixture.Checkout("develop");
		//fixture.MergeNoFF("release/1.2.0");
		fixture.MergeNoFF("master");

		fixture.SequenceDiagram.Destroy("release/1.2.0");
		fixture.Repository.Branches.Remove("release/1.2.0");

		fixture.Checkout("master");
		fixture.AssertFullSemver(config, "1.2.0");

		fixture.Checkout("develop");

		//fixture.AssertFullSemver(config, "1.3.0-alpha.2");
		fixture.AssertFullSemver(config, "1.3.0-alpha.6");


		fixture.MakeACommit("commit in develop - 4");
		fixture.MakeACommit("commit in develop - 5");
		//fixture.AssertFullSemver(config, "1.3.0-alpha.4");
		fixture.AssertFullSemver(config, "1.3.0-alpha.8");
	}
}

[Skoucail]

I have been working on this for the past 3days.
The fact is that i'm unable to find a solution that covers both problems. I guess my git knowledge is just to low.

I tried:

• Ignoring release branch as soon its merged (not good because continuous merging between release and dev branch must be allowed)
• Calculating commitsSinceTag based on number of commits ahead the dev branch is. (still decreases version number if release is merged to master)
• Trying to base the source sha on the message 'Merge branch 'master' into develop'
• And all kinds of variants based on the above...

But the longer i'm checking gitflow use-cases against the bugfix from #1635 i'm finding more and more wrongly calculated version numbers. Probably the biggest issue i encountered was a wrongly calculated master branch number. (Because the merge commit was ignored as source. It instantly counted to many commits => increased the patch number).

I do not know what the policy on issues like this is. But my current estimate is that the #1635 bugfix introduces way more issues then it fixes. So personally i would suggest to revert the changes. Add some tests for the things going wrong now. And hope someone is able to find a solution for #1635 without braking other scenarios...

Any thoughts @arturcic @ruhullahshah ?

[arturcic]

Unfortunately I don't have enough knowledge on the way the versioning is working as for now, I'm more involved in the project build/delivery then in the version computation.

[Skoucail]

Unfortunately I don't have enough knowledge on the way the versioning is working as for now, I'm more involved in the project build/delivery then in the version computation.

@arturcic i already had that feeling, thats why i tagged you about my question/suggestion about what you guys do in general when a feature/fix causes more problems then it solves.

[arturcic]

Sometimes we decide to revert, that's what we did few times. I think we need @asbjornu 's opinion

[ruhullahshah]

@Skoucail
The assumptions made by the fix in #1635 are stated therein and the fix works for only those assumptions. This fix is needed by us and other people who reported similar problems such as #1526.

I would have expected the git-flow use cases that it breaks to be unit tests as a part of GitVersion, but if they are not that means probably they were missed or not a part of the GitVersion spec. Maybe we can find a workaround wherein both the use cases can be incorporated, however, I am against reverting the change completely.

[Skoucail]

@ruhullahshah

I agree that the change fixes the problem described in the mentioned issues.
But the problem is that it breaks atleast a few more basic use-cased.

I would also love a change that fixes all the issues but in the last 3d i didnt find one.
I only found more issues with ignoring the ‘Merge branche’ for counting the prerelease nr. Thats why im sugesting the revert...

If you want and have time to look at it i can send you the tests (working before, breaking after change) first thing in the morning. As an extra of the one i already posted here before

[ruhullahshah]

@Skoucail

Sure it might(haven't analyzed yet) break some use cases, but I am interested to know if those use cases have been documented anywhere in the GitVersion unit tests, I believe no, because then the unit tests would not have been green at the time I submitted #1635. That raises the question, if those use cases are a part of the GitVersion spec in the first place? The reason I say this is because there are genuine cases of git usage that are not supported by GitVersion, for instance, see the discussion in #1600 (puts limitations on the way one names tags in Git, if using GitVersion)

From a usability point of view, I would love to contribute a change that covers as many use cases as possible, but I do not have the time at the moment to evaluate that from a code perspective. Sorry.

Reverting the change would again break things for projects wherein this fix works already or atleast prevent them from upgrading GitVersion. Is it a significant amount of effort for your project to adopt the workflow that works with the current relevant code?

[Skoucail]

@ruhullahshah

Well thats kinda the point, we arent doing anything fancy or different. We actualy just using the official gitflow specs.
We use the gitflow plugin in VS2019. That uses the gitflow commands build into git client.
The git client we use is the official ‘git for windows’ client...
Thats why i believe this is a huge issue. As many developers will use this setup.

Again i agree that seemingly some unit tests seems to be missing. But that doesnt mean nothing is going wrong unfortunaly.

[ruhullahshah]

In that case, I leave it upto the maintainers of GitVersion to decide.
@asbjornu any thoughts on this one?

[asbjornu]

I haven't read every word written in this thread, but I'm of the perception that what I wrote in #1526 (comment) still applies:

Yep, it's obvious that TrackReleaseBranchesVersionStrategy in its current incarnation is pretty useless in the absence of a release branch. Can we somehow deduce that a release branch was merged and then count the number of commits that were made on the release branch?

git rev-list --count HEAD ^release/x won't work since release/x doesn't exist anymore, but the commits are in the graph, so they can be walked from the merge commit if nothing else.

So until we find a way to (efficiently) walk the graph until we find the commit(s) of the deleted release branch, we can't solve this issue.

[Skoucail]

@asbjornu
Umm so what actions do you suggest?