diff --git a/tools/sfsnapshotgit b/tools/sfsnapshotgit
index 155259f0d66f0f4f258d641590dd3f6246e44f4b..af05c24bada3f296f3f8d9eeecfd35403c7683c1 100755 (executable)
--- a/tools/sfsnapshotgit
+++ b/tools/sfsnapshotgit
# Handle command errors (-e) and coder sleep deprivation issues (-u)
set -eu
-trap 'echo "An error occurred at line $LINENO"; exit 1' EXIT
+trap 'echo "An error occurred in sfsnapshotgit at line $LINENO"; exit 1' EXIT
# Send all command output to STDERR while allowing us to write to STDOUT
# using fd 3
git clean -qfdx
# Any branch used to create snapshots must already exist
git checkout "$HEAD"
-git pull "$SFSNAP_ORIGIN" "$HEAD"
+git fetch "$SFSNAP_ORIGIN" "$HEAD"
+git reset --hard "$SFSNAP_ORIGIN"/"$HEAD"
# Tags are important for git-describe
git fetch --tags "$SFSNAP_ORIGIN"