Merge pull request #1064 from MarkEWaite/do-not-search-parents-for-repo

[JENKINS-38699] Only check for git repo in current workspace dir
jenkinsci · Apr 4, 2021 · 449e6ab · 449e6ab
2 parents b90a2a0 + c561ab5
commit 449e6ab
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -106,7 +106,7 @@
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>git-client</artifactId>
-      <version>3.7.0</version>
+      <version>3.7.1</version>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>

diff --git a/src/main/java/hudson/plugins/git/GitSCM.java b/src/main/java/hudson/plugins/git/GitSCM.java
@@ -789,7 +789,7 @@ private PollingResult compareRemoteRevisionWithImpl(Job<?, ?> project, Launcher
 
         GitClient git = createClient(listener, environment, project, node, workingDirectory);
 
-        if (git.hasGitRepo()) {
+        if (git.hasGitRepo(false)) {
             // Repo is there - do a fetch
             listener.getLogger().println("Fetching changes from the remote Git repositories");
 
@@ -1205,7 +1205,7 @@ private void retrieveChanges(Run build, GitClient git, TaskListener listener) th
         List<RemoteConfig> repos = getParamExpandedRepos(build, listener);
         if (repos.isEmpty())    return; // defensive check even though this is an invalid configuration
 
-        if (git.hasGitRepo()) {
+        if (git.hasGitRepo(false)) {
             // It's an update
             if (repos.size() == 1)
                 log.println("Fetching changes from the remote Git repository");

diff --git a/src/main/java/jenkins/plugins/git/AbstractGitSCMSource.java b/src/main/java/jenkins/plugins/git/AbstractGitSCMSource.java
@@ -348,7 +348,7 @@ private <T, C extends GitSCMSourceContext<C, R>, R extends GitSCMSourceRequest>
             }
             GitClient client = git.getClient();
             client.addDefaultCredentials(getCredentials());
-            if (!client.hasGitRepo()) {
+            if (!client.hasGitRepo(false)) {
                 listener.getLogger().println("Creating git repository in " + cacheDir);
                 client.init();
             }

diff --git a/src/main/java/jenkins/plugins/git/GitSCMFileSystem.java b/src/main/java/jenkins/plugins/git/GitSCMFileSystem.java
@@ -329,7 +329,7 @@ public SCMFileSystem build(@NonNull Item owner, @NonNull SCM scm, @CheckForNull
                     CredentialsProvider.track(owner, credential);
                 }
 
-                if (!client.hasGitRepo()) {
+                if (!client.hasGitRepo(false)) {
                     listener.getLogger().println("Creating git repository in " + cacheDir);
                     client.init();
                 }
@@ -391,7 +391,7 @@ public SCMFileSystem build(@NonNull SCMSource source, @NonNull SCMHead head, @Ch
                 }
                 GitClient client = git.getClient();
                 client.addDefaultCredentials(gitSCMSource.getCredentials());
-                if (!client.hasGitRepo()) {
+                if (!client.hasGitRepo(false)) {
                     listener.getLogger().println("Creating git repository in " + cacheDir);
                     client.init();
                 }

diff --git a/src/main/java/jenkins/plugins/git/GitToolChooser.java b/src/main/java/jenkins/plugins/git/GitToolChooser.java
@@ -102,7 +102,7 @@ private boolean decideAndUseCache(String remoteName) throws IOException, Interru
             if (cacheDir != null) {
                 Git git = Git.with(TaskListener.NULL, new EnvVars(EnvVars.masterEnvVars)).in(cacheDir).using("git");
                 GitClient client = git.getClient();
-                if (client.hasGitRepo()) {
+                if (client.hasGitRepo(false)) {
                     long clientRepoSize = FileUtils.sizeOfDirectory(cacheDir) / 1024; // Conversion from Bytes to Kilo Bytes
                     if (clientRepoSize > sizeOfRepo) {
                         if (sizeOfRepo > 0) {