From 29210c52a31b2ddae6ff0f8a3c3394b60e350dba Mon Sep 17 00:00:00 2001 From: Nicolas Dechesne Date: Wed, 27 Jun 2018 10:38:23 +0200 Subject: ci-merge: use git describe when archiving the previous branch 'git describe' provides a better string to describe the branch, and for example it would show the kernel version, assuming that Linus' tags have been fetched. It makes it much simpler to look at branch history. Signed-off-by: Nicolas Dechesne Signed-off-by: Daniel Lezcano --- ci-merge | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-merge b/ci-merge index ef9e227..ef85c0a 100755 --- a/ci-merge +++ b/ci-merge @@ -588,7 +588,7 @@ git branch | grep -q "$INTEG_BRANCH$" if [ $? -eq 0 ]; then echo "The integration branch already exists." - INTEG_BRANCH_NEW_NAME=$INTEG_BRANCH-$(date +%Y%m%d-%H%M%S)-$(git log --format="%h" -n 1) + INTEG_BRANCH_NEW_NAME=$INTEG_BRANCH-$(date +%Y%m%d-%H%M%S)-$(git describe) echo "Rename it to $INTEG_BRANCH_NEW_NAME" git branch -M $INTEG_BRANCH $INTEG_BRANCH_NEW_NAME -- cgit v1.2.3