Merge pull request #74 from pauxus/reference-fix

[JENKINS-21434] Git Client 1.5.0+ does not resolve reference
jenkinsci · Jan 20, 2014 · 7b1a905 · 7b1a905
2 parents e6d5057 + 5b88253
commit 7b1a905
Showing 1 changed file with 18 additions and 7 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/gitclient/CliGitAPIImpl.java b/src/main/java/org/jenkinsci/plugins/gitclient/CliGitAPIImpl.java
@@ -311,13 +311,24 @@ public void execute() throws GitException, InterruptedException {
                     else if (!referencePath.isDirectory())
                         listener.error("Reference path is not a directory: " + reference);
                     else {
-                        try {
-                            File alternates = new File(workspace, ".git/objects/info/alternates");
-                            PrintWriter w = new PrintWriter(alternates);
-                            w.println(new File(referencePath, ".git/objects").getAbsolutePath());
-                            w.close();
-                        } catch (FileNotFoundException e) {
-                            listener.error("Failed to setup reference");
+                        // reference path can either be a normal or a base repository
+                        File objectsPath = new File(referencePath, ".git/objects");
+                        if (!objectsPath.isDirectory()) {
+                            // reference path is bare repo
+                            objectsPath = new File(referencePath, "objects");
+                        }
+                        if (!objectsPath.isDirectory())
+                            listener.error("Reference path does not contain an objects directory (no git repo?): " + objectsPath);
+                        else {
+                            try {
+                                File alternates = new File(workspace, ".git/objects/info/alternates");
+                                PrintWriter w = new PrintWriter(alternates);
+                                // git implementations on windows also use 
+                                w.println(objectsPath.getAbsolutePath().replace('\\', '/'));
+                                w.close();
+                            } catch (FileNotFoundException e) {
+                                listener.error("Failed to setup reference");
+                            }
                         }
                     }
                 }