Merge pull request #272 from Dohbedoh/feature/JENKINS-46737

[JENKINS-46737] Improve logging when linking a reference repository.
jenkinsci · Sep 30, 2017 · 55d96f5 · 55d96f5
2 parents 85e6a0d + 098385b
commit 55d96f5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/gitclient/CliGitAPIImpl.java b/src/main/java/org/jenkinsci/plugins/gitclient/CliGitAPIImpl.java
@@ -537,8 +537,10 @@ else if (!referencePath.isDirectory())
                         else {
                             File alternates = new File(workspace, ".git/objects/info/alternates");
                             try (PrintWriter w = new PrintWriter(alternates, Charset.defaultCharset().toString())) {
+                                String absoluteReference = objectsPath.getAbsolutePath().replace('\\', '/');
+                                listener.getLogger().println("Link to the reference repository " + absoluteReference);
                                 // git implementations on windows also use
-                                w.print(objectsPath.getAbsolutePath().replace('\\', '/'));
+                                w.print(absoluteReference);
                             } catch (UnsupportedEncodingException ex) {
                                 listener.error("Default character set is an unsupported encoding");
                             } catch (FileNotFoundException e) {

diff --git a/src/main/java/org/jenkinsci/plugins/gitclient/JGitAPIImpl.java b/src/main/java/org/jenkinsci/plugins/gitclient/JGitAPIImpl.java
@@ -1423,10 +1423,12 @@ else if (!referencePath.isDirectory())
                             else {
                                 try {
                                     File alternates = new File(workspace, ".git/objects/info/alternates");
+                                    String absoluteReference = objectsPath.getAbsolutePath().replace('\\', '/');
+                                    listener.getLogger().println("Link to the reference repository " + absoluteReference);
                                     // git implementations on windows also use
                                     try (PrintWriter w = new PrintWriter(alternates, "UTF-8")) {
                                         // git implementations on windows also use
-                                        w.print(objectsPath.getAbsolutePath().replace('\\', '/'));
+                                        w.print(absoluteReference);
                                     }
                                 } catch (FileNotFoundException e) {
                                     listener.error("Failed to setup reference");