Skip to content

Commit 7f6d21c

Browse files
author
Evan Lezar
committed
Merge branch 'fix-kitmaker' into 'main'
Fix GIT_BRANCH command See merge request nvidia/container-toolkit/container-toolkit!276
2 parents 50afd44 + 846ac34 commit 7f6d21c

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

versions.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@ CUDA_VERSION := 11.8.0
2929
GOLANG_VERSION := 1.18.8
3030

3131
GIT_COMMIT ?= $(shell git describe --match="" --dirty --long --always --abbrev=40 2> /dev/null || echo "")
32-
GIT_BRANCH ?= $(git rev-parse --abbrev-ref HEAD /dev/null || echo "${GIT_COMMIT}")
32+
GIT_BRANCH ?= $(git rev-parse --abbrev-ref HEAD 2> /dev/null || echo "${GIT_COMMIT}")
3333
SOURCE_DATE_EPOCH ?= $(shell git log -1 --format=%ct 2> /dev/null || echo "")

0 commit comments

Comments
 (0)