diff --git a/build.gradle b/build.gradle index c62ea59..d0412a1 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ apply plugin: 'application' //apply plugin: 'maven-publish' group = 'com.dkirrane.groovy.gitflow' -version = '2.5' +version = '2.6' mainClassName = "com.dkirrane.gitflow.groovy.conflicts.Main" diff --git a/src/main/groovy/com/dkirrane/gitflow/groovy/GitflowCommon.groovy b/src/main/groovy/com/dkirrane/gitflow/groovy/GitflowCommon.groovy index 157d2aa..0a52d7b 100644 --- a/src/main/groovy/com/dkirrane/gitflow/groovy/GitflowCommon.groovy +++ b/src/main/groovy/com/dkirrane/gitflow/groovy/GitflowCommon.groovy @@ -269,6 +269,16 @@ class GitflowCommon { return localHotfixBranches.findAll({ it.startsWith(prefix) }) } + List gitLocalSupportBranches() { + List localSupportBranches = new ArrayList() + + def process = "git branch --no-color".execute(envp, repoDir) + process.in.eachLine { line -> localSupportBranches.add(line.replaceAll("^(\\*\\s+|\\s+)", "")) } + + String prefix = getSupportBranchPrefix() + return localSupportBranches.findAll({ it.startsWith(prefix) }) + } + Boolean gitIsCleanWorkingTree() { // Check for unstaged changes in the working tree (exit code is 0 if clean) Process wcProcess = "git diff --no-ext-diff --ignore-submodules --quiet --exit-code".execute(envp, repoDir) @@ -468,13 +478,14 @@ class GitflowCommon { String stOut = standard.toString() String stErr = error.toString() Integer exitCode = process.exitValue() - + if(exitCode != 0 || stErr) { println("") log.info stOut - log.error "Cannot connect to remote Git repo '${origin}' ${getOriginURL()}. Check your Git credentials." - log.error stErr.trim() - log.error "(exit code ${exitCode})" + log.error "Issue occurred when connecting to remote Git repo '${origin}' ${getOriginURL()}" + log.error "Check your Git credentials and review Git error below:" + log.error "Git exit code: ${exitCode}" + log.error stErr.trim() println("") }