LegacyCompatibleGitAPIImpl, etc: reconcile code style with changes in…

… the PR jenkinsci#644 (by @MarkEWaite) and fix some
jimklimov · Jun 14, 2023 · 26059aa · 26059aa
1 parent 26fba6b
commit 26059aa
Show file tree

Hide file tree

Showing 2 changed files with 296 additions and 141 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/gitclient/CliGitAPIImpl.java b/src/main/java/org/jenkinsci/plugins/gitclient/CliGitAPIImpl.java
@@ -2963,11 +2963,15 @@ private String launchCommandIn(ArgumentListBuilder args, File workDir, EnvVars e
 
  if (status != 0) {
  if (workDir == null)
- workDir = java.nio.file.Paths.get(".").toAbsolutePath().normalize().toFile();
- throw new GitException("Command \"" + command +
- "\" executed in workdir \"" + workDir.toString() +
- "\" returned status code " + status +
- ":\nstdout: " + stdout + "\nstderr: " + stderr);
+ workDir = java.nio.file.Paths.get(".")
+ .toAbsolutePath()
+ .normalize()
+ .toFile();
+ throw new GitException("Command \"" + command
+ + "\" executed in workdir \"" + workDir.toString()
+ + "\" returned status code " + status
+ + ":\nstdout: " + stdout
+ + "\nstderr: " + stderr);
  }
 
  return stdout;