Skip to content

Commit 3de235b

Browse files
author
Ian Campbell
committed
update-linuxkit-hashes: Include linuxkit tag (if any) in commit message.
Signed-off-by: Ian Campbell <ijc@docker.com>
1 parent 71cad45 commit 3de235b

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

scripts/update-linuxkit-hashes.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ case $# in
2020
esac
2121

2222
lkrev=$(git -C $tdir/lk show --oneline -s HEAD)
23+
lktag=$(git -C $tdir/lk tag -l --points-at HEAD)
2324

2425
update_hash() {
2526
local tag=$1; shift
@@ -68,6 +69,10 @@ if [ ! -n "$tag" ] ; then
6869
echo "Failed to extract kernel tag" >&2
6970
exit 1
7071
fi
72+
tagmsg=""
73+
if [ -n "$lktag" ] ; then
74+
tagmsg=$(printf "\nTag: %s" $lktag)
75+
fi
7176
# Not update_hash since the tag is not a hash in this case
7277

7378
echo "Updating to $tag"
@@ -82,7 +87,7 @@ email=$(git config --get user.email)
8287
cat >$tdir/commit-msg <<EOF
8388
Updated hashes from https://github.com/linuxkit/linuxkit
8489
85-
Commit: $lkrev
90+
Commit: $lkrev$tagmsg
8691
8792
Signed-off-by: $uname <$email>
8893
EOF

0 commit comments

Comments
 (0)