From 0b2aed858ad2620087bb3b5ad52e5bf9f1df4b1f Mon Sep 17 00:00:00 2001
From: Zhang Dongliang <zhangdongliang@yunion.cn>
Date: Mon, 7 Dec 2020 17:09:13 +0800
Subject: [PATCH] =?UTF-8?q?fix(git,make):=20=E4=BF=AE=E6=AD=A3=20gitbranch?=
 =?UTF-8?q?=20=E5=8F=98=E9=87=8F=E7=9A=84=E8=8E=B7=E5=8F=96=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F=EF=BC=8C=E8=A7=A3=E5=86=B3=E8=87=AA=E5=8A=A8=E5=8D=87?=
 =?UTF-8?q?=E7=BA=A7=E7=89=88=E6=9C=AC=20tag=20=E4=B8=8D=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Makefile               | 2 +-
 scripts/docker_push.sh | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 77053084d3..2eda0723ae 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ BUILD_SCRIPT := $(ROOT_DIR)/build/build.sh
 
 ifeq ($(ONECLOUD_CI_BUILD),)
 	GIT_COMMIT := $(shell git rev-parse --short HEAD)
-	GIT_BRANCH := $(shell git name-rev --name-only HEAD)
+	GIT_BRANCH := $(shell git branch -r --contains |head -1| xargs| sed -E -e "s%(origin|upstream)/?%%g")
 	GIT_VERSION := $(shell git describe --always --tags --abbrev=14 $(GIT_COMMIT)^{commit})
 	GIT_TREE_STATE := $(shell s=`git status --porcelain 2>/dev/null`; if [ -z "$$s" ]; then echo "clean"; else echo "dirty"; fi)
 	BUILD_DATE := $(shell date -u +'%Y-%m-%dT%H:%M:%SZ')
diff --git a/scripts/docker_push.sh b/scripts/docker_push.sh
index 89111dc4a7..e36faa7145 100755
--- a/scripts/docker_push.sh
+++ b/scripts/docker_push.sh
@@ -45,7 +45,6 @@ build_bin() {
     local BUILD_CGO=$3
     case "$1" in
         baremetal-agent)
-        echo GOOS=linux make cmd/$1
             GOOS=linux make cmd/$1
             ;;
         climc)