diff options
author | Nicolas Dechesne <nicolas.dechesne@linaro.org> | 2018-06-27 10:38:23 +0200 |
---|---|---|
committer | Daniel Lezcano <daniel.lezcano@linaro.org> | 2018-06-27 11:48:29 +0200 |
commit | 29210c52a31b2ddae6ff0f8a3c3394b60e350dba (patch) | |
tree | 000ed6fb1fea476f69a9075c30ec5940921f3cfe | |
parent | 5db5a786f8e0f271d3e46575f47b708e970d3a3c (diff) |
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 <nicolas.dechesne@linaro.org>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
-rwxr-xr-x | ci-merge | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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 |