From 7bebc65cb2b398c87f4df3d61de50d98ec712916 Mon Sep 17 00:00:00 2001 From: Henning Andersen <33268011+henningandersen@users.noreply.github.com> Date: Fri, 10 Jan 2020 13:54:32 +0100 Subject: [PATCH] GlobalBuildInfo support packed-refs with work-tree (#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 #47464 --- .../main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy index 6d78caad71673..2cf2e5a30b48d 100644 --- 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 { 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 lines = Files.lines(dotGit.resolve("packed-refs")); + Stream lines = Files.lines(gitDir.resolve("packed-refs")); try { revision = lines.map( { s -> p.matcher(s) }) .filter( { m -> m.matches() })