Skip to content

Commit

Permalink
Ignore submodules for detect local changes
Browse files Browse the repository at this point in the history
  • Loading branch information
s1lentq committed Sep 23, 2019
1 parent 0b517e0 commit 46624d9
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions buildSrc/src/main/groovy/versioning/GitVersioner.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import org.eclipse.jgit.api.Status;
import org.eclipse.jgit.lib.ObjectId
import org.eclipse.jgit.lib.Repository
import org.eclipse.jgit.lib.StoredConfig
import org.eclipse.jgit.submodule.SubmoduleWalk;
import org.eclipse.jgit.revwalk.RevCommit
import org.eclipse.jgit.revwalk.RevWalk
import org.eclipse.jgit.storage.file.FileRepositoryBuilder
Expand Down Expand Up @@ -58,10 +59,8 @@ class GitVersioner {
// check uncommited changes
static boolean getUncommittedChanges(Repository repo) {
Git git = new Git(repo);
Status status = git.status().call();

Set<String> uncommittedChanges = status.getUncommittedChanges();
for(String uncommitted : uncommittedChanges) {
Status status = git.status().setIgnoreSubmodules(SubmoduleWalk.IgnoreSubmoduleMode.ALL).call();
if (!status.getUncommittedChanges().isEmpty()) {
return true;
}

Expand Down

0 comments on commit 46624d9

Please sign in to comment.