From 755ab5acfb7254445e8504f1a2241ae13a4ebb42 Mon Sep 17 00:00:00 2001 From: Geoff Reedy Date: Fri, 26 Apr 2019 02:25:27 -0600 Subject: [PATCH] Use HEAD instead of @ shortcut for git in launcher (#428) The abbreviation @ for HEAD was added in git 1.8.5. The launcher claims to be compatible with git version 1.8.0 but the use of this abbreviation breaks this compatibility. This change is needed to support RHEL 7.6 which has only git 1.8.3.1. --- launcher | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/launcher b/launcher index 4e61592..39928d9 100755 --- a/launcher +++ b/launcher @@ -760,9 +760,9 @@ case "$command" in git remote update - LOCAL=$(git rev-parse @) + LOCAL=$(git rev-parse HEAD) REMOTE=$(git rev-parse @{u}) - BASE=$(git merge-base @ @{u}) + BASE=$(git merge-base HEAD @{u}) if [ $LOCAL = $REMOTE ]; then echo "Launcher is up-to-date" -- 2.25.1