GetGitConfigValue should use --includes to respect include.* directiv…

…es in config files when looking up values
nebula-plugins · Jan 9, 2024 · 5e778b6 · 5e778b6
1 parent c5f89fe
commit 5e778b6
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 48 deletions.
diff --git a/src/main/groovy/nebula/plugin/release/git/command/GitReadCommand.groovy b/src/main/groovy/nebula/plugin/release/git/command/GitReadCommand.groovy
@@ -312,7 +312,7 @@ abstract class GetGitConfigValue extends GitReadCommand {
     String obtain() {
         try {
             if(parameters.getGitConfigScope().isPresent()) {
-                return executeGitCommand( "config", parameters.getGitConfigScope().get(), parameters.getGitConfigKey().get())
+                return executeGitCommand( "config", parameters.getGitConfigScope().get(), "--includes", parameters.getGitConfigKey().get())
             } else {
                 return executeGitCommand( "config", parameters.getGitConfigKey().get())
             }
@@ -323,20 +323,3 @@ abstract class GetGitConfigValue extends GitReadCommand {
     }
 }
 
-
-/**
- * Set a given Git config key with its value for a given scope
- */
-abstract class SetGitConfigValue extends GitReadCommand {
-    private static final Logger logger = LoggerFactory.getLogger(SetGitConfigValue)
-    @Override
-    String obtain() {
-        try {
-            return executeGitCommand( "config", parameters.getGitConfigKey().get(), parameters.getGitConfigValue().get())
-        } catch (Exception e) {
-            logger.debug("Could not set git config {} {} {}", parameters.getGitConfigKey().get(), parameters.getGitConfigValue().get())
-            return null
-        }
-    }
-}
-
diff --git a/src/main/groovy/nebula/plugin/release/git/command/GitReadOnlyCommandUtil.groovy b/src/main/groovy/nebula/plugin/release/git/command/GitReadOnlyCommandUtil.groovy
@@ -103,14 +103,6 @@ class GitReadOnlyCommandUtil implements Serializable {
         }
     }
 
-    String getUsernameFromLog() {
-        try {
-            return currentBranchProvider.get().toString().replaceAll("\n", "").trim()
-        } catch (Exception e) {
-            return null
-        }
-    }
-
     Boolean hasCommit() {
         try {
             String describe = anyCommitProvider.get().toString()
@@ -154,8 +146,6 @@ class GitReadOnlyCommandUtil implements Serializable {
         }
     }
 
-
-
     String describeHeadWithTags(boolean excludePreReleases) {
         try {
             def describeTagInHeadProvider = excludePreReleases ? providers.of(DescribeHeadWithTagWithExclude.class) {
@@ -278,24 +268,4 @@ class GitReadOnlyCommandUtil implements Serializable {
             return null
         }
     }
-
-    /**
-     * Returns a git config value for a given scope
-     * @param scope
-     * @param configKey
-     * @return
-     */
-    void setGitConfig(String configKey, String configValue) {
-        try {
-            def getConfigValueProvider = providers.of(SetGitConfigValue.class) {
-                it.parameters.rootDir.set(rootDir)
-                it.parameters.gitConfigKey.set(configKey)
-                it.parameters.gitConfigValue.set(configValue)
-            }
-            getConfigValueProvider.get().toString()?.
-                    replaceAll("\n", "")?.toString()
-        } catch(Exception e) {
-            logger.debug("Could not set git config {} {}", configKey, configValue)
-        }
-    }
 }