Merge branch 'stable-5.12' into stable-5.13
* stable-5.12: FS: debug logging only if system config file cannot be found Change-Id: I4f6fd422e15361118134c4d1534507e0bd81a172
This commit is contained in:
commit
7ca091a526
|
@ -1531,6 +1531,7 @@ protected File discoverGitSystemConfig() {
|
|||
|
||||
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$
|
||||
|
@ -1553,7 +1554,10 @@ protected File discoverGitSystemConfig() {
|
|||
"--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) {
|
||||
|
|
Loading…
Reference in New Issue