[SCM-1029] JGit performing empty commit on CheckIn command if includes or excludes fileset is defined but no files changed in it

[jira-importer]

Markus Hoffrogge opened SCM-1029 and commented

Issue

If includes and/or excludes config is defined, then JGit checkIn is performing empty commits if no changes are applied to the effective fileset content BUT other files are changed that are NOT within the effective scope of the includes or excludes related fileset.

 

Root cause

Method JGitCheckInCommand.executeCheckInCommand is using git.status().call().{}hasUncommittedChanges(){} if there is nothing to commit returned by JGitUtils.addAllFiles(git, fileSet).

Since git.status().call().{}hasUncommittedChanges(){} returns the state of any file within the working tree of the repo, this will set doCommit true even in case there is no file changed or added in scope of the includes / excludes effective fileset.

 

Solution

Use OR condition of:
  - status.getAdded().size() > 0
  - status.getChanged().size() > 0
  - status.getRemoved() > 0

instead of status.hasUncommittedChanges() if an includes / excludes FileSet is specified.

PR #238

---

Affects: 2.1.0

Remote Links:

• GitHub Pull Request #238
  

[jira-importer]

Michael Osipov commented

Fixed with c4bbee338746f1979e13c8266c689db2c0ad6bd1.

[jira-importer]

Markus Hoffrogge commented

Michael Osipov Is there a schedule when maven-scm release version 2.2.0 is going to be released?

[jira-importer]

Michael Osipov commented

U don't have any