-
Notifications
You must be signed in to change notification settings - Fork 652
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[ISSUE]: NotImplementedException in TrunkBased-Workflow #4056
Comments
Please analyze this issue in more detail and simplify your scenario. In advance provide:
to reproduce this issue. Please notice: The |
When upgrading to 6 I've noticed the same stacktrace from the build server on merge commits, just trying to understand what the right config should be here... GitVersion/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/MainlineVersionStrategy.cs Lines 226 to 242 in a4dde97
|
I think this occurs when there is a merge message on te main branch. |
Tip: I removed |
After some digging, cloing the sources and add debug information I can confirm that these are merge requests towards Main coming from PRs. What fixed he problem was to add the malicious merges to the ignore list. Anyhow, this git "tree" was a result out of working git operations. |
@steven-r, sure. If you can figure out a way to ignore such commits without breaking any existing tests, we would be happy to accept a pull request. |
@steven-r Can you please create a minimal example or somehow a visual representation to have a basis for the discussion? Would be very good. Actually I'm not sure if a merge commit from main is generally a good idea in the TrunkBased workflow. Anyway ignoring the commit is not what I would expect. I would expect at least that it will be handled like a normal commit. What do you think? |
I've just managed to replicate it.
Git Log output:
Repository you can test with: |
My real use case is a list of dependabot updates on main where there's no rebase in between (as it is not needed in all cases).
|
I've tried ignoring those commits and now I'm getting a brand new error:
|
Also happened to me with merge message
Just putting it out there for future reference. |
I'm stuck with the same problem on repositories with merge message. At the moment using |
Is there an ETA or plan on the fix of this? I've got auto-merged dependency updates in my repos, and if two automatically merge without rebasing in between it breaks GitVersioning every time. |
I think this feature needs to be implemented: At the moment the above feature implementation has not started. Any pull-requests are appreciated. |
Prerequisites
GitVersion package
GitVersion.Tool
GitVersion version
6.0.0-rc1
Operating system
Linux, Windows
What are you seeing?
When running gitversion on my git repos, I receive a
NotImplementedException
.I was using Mainline for the past and I'm trying out the 6.0-RC1 release now.
What is expected?
A valid version description.
Steps to Reproduce
use my repos (it's private, sorry), with the following configuration:
RepositoryFixture Test
No response
Output log or link to your CI build (if appropriate).
The text was updated successfully, but these errors were encountered: