[ https://issues.apache.org/jira/browse/SCM-835?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15365785#comment-15365785 ]
ASF GitHub Bot commented on SCM-835: ------------------------------------ GitHub user shvar opened a pull request: https://github.com/apache/maven-scm/pull/51 fix SCM-835 collision Please, see: https://issues.apache.org/jira/browse/SCM-835 You can merge this pull request into a Git repository by running: $ git pull https://github.com/shvar/maven-scm master Alternatively you can review and apply these changes as the patch at: https://github.com/apache/maven-scm/pull/51.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #51 ---- commit de40d5ecbf39c0812b218115e6c86b6f8075ee95 Author: Eli Shvartsman <e...@shvar.com> Date: 2016-07-07T08:02:53Z fix SCM-835 collision ---- > includes directive doesn't work correctly when other files in directory > changes > ------------------------------------------------------------------------------- > > Key: SCM-835 > URL: https://issues.apache.org/jira/browse/SCM-835 > Project: Maven SCM > Issue Type: Bug > Reporter: Eli Shvartsman > > We have a scenario, when we have to commit only one file, for example > "LICENSE.md". > When we use > {code} > <includes>LICENSE.md</includes> > {code} > GitCheckInCommand is invoking a GitStatusConsumer for fileSet.getBasedir() > and if there are any changes, passes them to "commit" and "push" phases. > If there are any other files changed (except LICENSE.md), than > statusConsumer.getChangedFiles() is not empty and we proceed. But if we > didn't made any changes to our file, "commit" phase will fail, as there is > nothing to commit (in terms of our fileSet). > I suppose to patch GitStatusConsumer, so it could be aware of fileSet and not > give us status of changed files if they are not in a fileSet. -- This message was sent by Atlassian JIRA (v6.3.4#6332)