From c861e6742b1e5fae987cdad172d0d00b59422d61 Mon Sep 17 00:00:00 2001
From: Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
Date: Fri, 17 Feb 2017 15:18:00 +0100
Subject: [PATCH] Adding the modification to how the checkout scripts would
fast forward when they can, as suggested on the merge request.
Former-commit-id: 9d33d9b85710c7695e72b7d9adb9dff21ba6b645
---
Build/AtlasBuildScripts/checkout_Gaudi.sh | 2 +-
Build/AtlasBuildScripts/checkout_atlasexternals.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Build/AtlasBuildScripts/checkout_Gaudi.sh b/Build/AtlasBuildScripts/checkout_Gaudi.sh
index e3594529d3f..3693c342d2c 100755
--- a/Build/AtlasBuildScripts/checkout_Gaudi.sh
+++ b/Build/AtlasBuildScripts/checkout_Gaudi.sh
@@ -77,7 +77,7 @@ git checkout ${TAGBRANCH}
# If this is a branch, fast forward to the latest version of it:
if git show-ref -q --verify "refs/heads/${TAGBRANCH}" 2>/dev/null; then
- git pull
+ git reset --hard ${TAGBRANCH}
fi
# If an output file was not specified, stop here:
diff --git a/Build/AtlasBuildScripts/checkout_atlasexternals.sh b/Build/AtlasBuildScripts/checkout_atlasexternals.sh
index a15df685566..36b04028c07 100755
--- a/Build/AtlasBuildScripts/checkout_atlasexternals.sh
+++ b/Build/AtlasBuildScripts/checkout_atlasexternals.sh
@@ -81,7 +81,7 @@ git checkout ${TAGBRANCH}
# If this is a branch, fast forward to the latest version of it:
if git show-ref -q --verify "refs/heads/${TAGBRANCH}" 2>/dev/null; then
- git pull
+ git reset --hard ${TAGBRANCH}
fi
# If an output file was not specified, stop here:
--
GitLab