6.0.0-beta.7 - CommitID exists in two-branches

[Sefriol]

We are using Azure Pipelines with DevOps where merge from dev to main is done via Rebase Fast Forward. I have a following GitVersion.yml:

strategies: [TaggedCommit]
branches:
  main:
    mode: ContinuousDeployment

Expected behavior:

%%{init: { 'gitGraph': {'rotateCommitLabel': false, 'chartOrientation': 'horizontal' }} }%%
 gitGraph
    commit id: "init"
    branch dev
    branch feature
    commit id: "feat: 1"
    commit id: "feat: 2"
    commit id: "feat: 3"
    checkout dev
    merge feature id: "rebase+merge" tag: "v0.1.0-alpha.4"
    checkout main
    merge dev id: "rebase fastforward" tag: "v0.1.0, v0.1.0-alpha.4"

Loading

Actual behavior:

%%{init: { 'gitGraph': {'rotateCommitLabel': false, 'chartOrientation': 'horizontal' }} }%%
 gitGraph
    commit id: "init"
    branch dev
    branch feature
    commit id: "feat: 1"
    commit id: "feat: 2"
    commit id: "feat: 3"
    checkout dev
    merge feature id: "rebase+merge" tag: "v0.1.0-alpha.4"
    checkout main
    merge dev id: "rebase fastforward" tag: "v0.1.0-alpha.4 v0.1.0--no-branch-.1"

Loading

Reasoning why this happens is not that complicated. Azure DevOps checkouts the branch in detached head commit, which now exists in both dev and main. I assume that GitVersion is not sure in which branch this commit exists, so it will add the -no-branch- branch tag.

Question is: What would be the best way to solve this? Currently I have just a dummy way where I use different variable to generate a new tag SemVer vs MajorMinorPatch based on the branch within the pipeline itself. I was wondering if there were something in the config that I should do to achieve the result I want.

Another option would be to change the git checkout to the branch itself, away from the detached head commit, but it might cause some other side effects. I am leaving it on the table for now.

[Sefriol]

I decided to fix this for now by checking out the current branch and ensuring that the branch commit matches the pipeline commit id.