From a60dbc7c20db7c361f0498679187ba6bd6538216 Mon Sep 17 00:00:00 2001 From: Francis Deslauriers Date: Fri, 26 May 2017 14:54:22 -0400 Subject: [PATCH] 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 --- scripts/lttng-baremetal-tests/generate-properties-master.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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)" -- 2.34.1