From: Francis Deslauriers <francis.deslauriers@efficios.com>
Date: Fri, 26 May 2017 18:54:22 +0000 (-0400)
Subject: jjb: Use full Git commit IDs rather than short ones for Linux repository
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=a60dbc7c20db7c361f0498679187ba6bd6538216;p=lttng-ci.git

jjb: Use full Git commit IDs rather than short ones for Linux repository

There was a git checkout ambiguity error because two commits had the
same 7 first characters (short ID). To avoid this in the future, use the
full commit ID.

Signed-off-by: Francis Deslauriers <francis.deslauriers@efficios.com>
---

diff --git a/scripts/lttng-baremetal-tests/generate-properties-master.sh b/scripts/lttng-baremetal-tests/generate-properties-master.sh
index d344ab4..dad0453 100644
--- a/scripts/lttng-baremetal-tests/generate-properties-master.sh
+++ b/scripts/lttng-baremetal-tests/generate-properties-master.sh
@@ -38,7 +38,7 @@ echo "LINUX_PATH=$LINUX_PATH" >> properties.txt
 echo "LTTNG_MODULES_PATH=$LTTNG_MODULES_PATH" >> properties.txt
 echo "LTTNG_TOOLS_PATH=$LTTNG_TOOLS_PATH" >> properties.txt
 
-KERNEL_COMMIT_ID="$(git --git-dir="$LINUX_PATH"/.git/ --work-tree="$LINUX_PATH" rev-parse --short HEAD)"
+KERNEL_COMMIT_ID="$(git --git-dir="$LINUX_PATH"/.git/ --work-tree="$LINUX_PATH" rev-parse HEAD)"
 LTTNG_MODULES_COMMIT_ID="$(git --git-dir="$LTTNG_MODULES_PATH"/.git/ --work-tree="$LTTNG_MODULES_PATH" rev-parse --short HEAD)"
 LTTNG_TOOLS_COMMIT_ID="$(git --git-dir="$LTTNG_TOOLS_PATH"/.git/ --work-tree="$LTTNG_TOOLS_PATH" rev-parse --short HEAD)"