GlobalBuildInfo support packed-refs with work-tree (elastic#50791)

The packed-refs support was using the original .git path, changed to use the real .git directory after reference from worktree has been followed. Relates elastic#47464
pgomulka · Jan 23, 2020 · 7bebc65 · 7bebc65
1 parent be72e3f
commit 7bebc65
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy
@@ -1124,10 +1124,10 @@ class BuildPlugin implements Plugin<Project> {
                 Path refFile = gitDir.resolve(refName)
                 if (Files.exists(refFile)) {
                     revision = readFirstLine(refFile)
-                } else if (Files.exists(dotGit.resolve("packed-refs"))) {
+                } else if (Files.exists(gitDir.resolve("packed-refs"))) {
                     // Check packed references for commit ID
                     Pattern p = Pattern.compile("^([a-f1-9]{40}) " + refName + "\$")
-                    Stream<String> lines = Files.lines(dotGit.resolve("packed-refs"));
+                    Stream<String> lines = Files.lines(gitDir.resolve("packed-refs"));
                     try {
                         revision = lines.map( { s -> p.matcher(s) })
                                 .filter( { m -> m.matches() })