Skip to content

Commit 1abd92b

Browse files
pdo-axelorpbe-axelor
authored andcommitted
Fix extracting git revision when packed-refs are used
1 parent 43cd63d commit 1abd92b

File tree

1 file changed

+18
-2
lines changed

1 file changed

+18
-2
lines changed

build.gradle

+18-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,24 @@ def gitGitRevision(p) {
2929

3030
if(isCommit) return head[0].trim()
3131

32-
def refHead = new File(gitFolder + head[1].trim())
33-
return refHead.text.trim()
32+
def refPath = head[1].trim()
33+
def refHead = new File(gitFolder + refPath)
34+
35+
if (refHead.exists()) {
36+
return refHead.text.trim()
37+
}
38+
39+
def packedRefsFile = new File(gitFolder + "packed-refs")
40+
41+
if (packedRefsFile.exists()) {
42+
def packedRefs = packedRefsFile.text
43+
def matcher = packedRefs =~ /(?m)^([0-9a-f]+) ${refPath}$/
44+
if (matcher.find()) {
45+
return matcher.group(1)
46+
}
47+
}
48+
49+
return null
3450
}
3551

3652
configure(subprojects - project(':axelor-front')) {

0 commit comments

Comments
 (0)