diff options
| author | Matthias Sohn | 2021-11-28 11:02:45 +0000 |
|---|---|---|
| committer | Matthias Sohn | 2021-11-28 11:02:45 +0000 |
| commit | 91233eea56475960a5a09f5c2e9c094186fe0da8 (patch) | |
| tree | 07eab50433e4c1bd0f032893f9f7c8fe6c654a94 | |
| parent | ecbe49efbd29a2137cb6e5dd5c01c2e5a39c213f (diff) | |
| parent | 684ec2c316efed11023921860b9e039f0023f1b8 (diff) | |
| download | jgit-91233eea56475960a5a09f5c2e9c094186fe0da8.tar.gz jgit-91233eea56475960a5a09f5c2e9c094186fe0da8.tar.xz jgit-91233eea56475960a5a09f5c2e9c094186fe0da8.zip | |
Merge branch 'stable-5.10' into stable-5.11
* stable-5.10:
FS: debug logging only if system config file cannot be found
Change-Id: Icd52afc3a74e0d2618181f62515d7e2a8d6c9739
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java index 586ce7d9d7..bf8a46b946 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java @@ -1529,6 +1529,7 @@ public abstract class FS { String w; try { + // This command prints the path even if it doesn't exist w = readPipe(gitExe.getParentFile(), new String[] { gitExe.getPath(), "config", "--system", //$NON-NLS-1$ //$NON-NLS-2$ "--edit" }, //$NON-NLS-1$ @@ -1551,7 +1552,10 @@ public abstract class FS { "--show-origin", "--list", "-z" }, //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ Charset.defaultCharset().name()); } catch (CommandFailedException e) { - LOG.warn(e.getMessage()); + // This command fails if the system config doesn't exist + if (LOG.isDebugEnabled()) { + LOG.debug(e.getMessage()); + } return null; } if (w == null) { |