Skip to content
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

feature-finish does not always commit everything and leaves uncommitted changes in master #292

Open
ziad-aouad opened this issue Apr 23, 2021 · 1 comment

Comments

@ziad-aouad
Copy link

I have a simple project that has the configuration below for the plugin

<plugin>
    <groupId>com.amashchenko.maven.plugin</groupId>
    <artifactId>gitflow-maven-plugin</artifactId>
    <version>1.16.0</version>
    <configuration>
        <gitFlowConfig>
            <developmentBranch>master</developmentBranch>
        </gitFlowConfig>
        <skipTestProject>true</skipTestProject>
        <fetchRemote>false</fetchRemote>
        <pushRemote>false</pushRemote>
        <skipFeatureVersion>true</skipFeatureVersion>
        <preFeatureFinishGoals>groovy:execute</preFeatureFinishGoals>
        <preReleaseGoals>groovy:execute</preReleaseGoals>
    </configuration>
</plugin>

The preFeatureFinishGoals inserts some changes in my tracked files. This makes them modified from a git perspective.
When the mvn gitflow:feature-finish terminates, the changes are not committed into master.
I rather end up with uncommitted changes in my master.

Funny thing is when I comment the <skipFeatureVersion> tag, then everything behaves as expected and no uncommitted edits end up in my master branch.

Any idea what I might be doing wrong?

@aleksandr-m
Copy link
Owner

@ziad-aouad Yes, this is because of the commit which happens only if skipFeatureVersion is set to false.
If you know that your script changes tracked files maybe you can commit them in the script as well.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants