Merge branch 'fix-git-branch' into 'main'

Fix git branch shell command

See merge request nvidia/container-toolkit/container-toolkit!277
This commit is contained in:
Evan Lezar 2023-01-31 14:08:35 +00:00
commit 95ca1c2e50

View File

@ -29,5 +29,5 @@ CUDA_VERSION := 11.8.0
GOLANG_VERSION := 1.18.8 GOLANG_VERSION := 1.18.8
GIT_COMMIT ?= $(shell git describe --match="" --dirty --long --always --abbrev=40 2> /dev/null || echo "") GIT_COMMIT ?= $(shell git describe --match="" --dirty --long --always --abbrev=40 2> /dev/null || echo "")
GIT_BRANCH ?= $(git rev-parse --abbrev-ref HEAD 2> /dev/null || echo "${GIT_COMMIT}") GIT_BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD 2> /dev/null || echo "${GIT_COMMIT}")
SOURCE_DATE_EPOCH ?= $(shell git log -1 --format=%ct 2> /dev/null || echo "") SOURCE_DATE_EPOCH ?= $(shell git log -1 --format=%ct 2> /dev/null || echo "")