From: David Griffith Date: Mon, 27 May 2019 07:37:20 +0000 (-0700) Subject: Ensure only the current branch appears in GIT_BRANCH. X-Git-Url: https://scope-eye.net/git/?a=commitdiff_plain;h=6057b8b924c65507e59224370d94fbab5c0bcd42;p=liskon_frotz.git Ensure only the current branch appears in GIT_BRANCH. --- diff --git a/Makefile b/Makefile index 5bdb215..358dcc2 100644 --- a/Makefile +++ b/Makefile @@ -132,7 +132,7 @@ ifneq ($(and $(wildcard $(GIT_DIR)),$(shell which git)),) GIT_HASH_SHORT = $(shell git rev-parse --short HEAD) GIT_DATE = $(shell git show -s --format=%ci) else - GIT_BRANCH = $(shell echo "$Format:%D$" | sed s/^.*\>\\s*//) + GIT_BRANCH = $(shell echo "$Format:%D$" | sed s/^.*\>\\s*// | cut -d, -f1) GIT_HASH = "$Format:%H$" GIT_HASH_SHORT = "$Format:%h$" GIT_DATE = "$Format:%ci$"