Skip to content

Commit 616b905

Browse files
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
1 parent 15944c2 commit 616b905

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

buildSrc/src/main/java/org/elasticsearch/gradle/info/GlobalBuildInfoPlugin.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,10 +271,10 @@ public static String gitRevision(File rootDir) {
271271
Path refFile = gitDir.resolve(refName);
272272
if (Files.exists(refFile)) {
273273
revision = readFirstLine(refFile);
274-
} else if (Files.exists(dotGit.resolve("packed-refs"))) {
274+
} else if (Files.exists(gitDir.resolve("packed-refs"))) {
275275
// Check packed references for commit ID
276276
Pattern p = Pattern.compile("^([a-f0-9]{40}) " + refName + "$");
277-
try (Stream<String> lines = Files.lines(dotGit.resolve("packed-refs"))) {
277+
try (Stream<String> lines = Files.lines(gitDir.resolve("packed-refs"))) {
278278
revision = lines.map(p::matcher)
279279
.filter(Matcher::matches)
280280
.map(m -> m.group(1))

0 commit comments

Comments
 (0)