diff options
Diffstat (limited to 'tools/sfsnapshotgit')
-rwxr-xr-x | tools/sfsnapshotgit | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/sfsnapshotgit b/tools/sfsnapshotgit index 155259f..af05c24 100755 --- a/tools/sfsnapshotgit +++ b/tools/sfsnapshotgit | |||
@@ -9,7 +9,7 @@ | |||
9 | 9 | ||
10 | # Handle command errors (-e) and coder sleep deprivation issues (-u) | 10 | # Handle command errors (-e) and coder sleep deprivation issues (-u) |
11 | set -eu | 11 | set -eu |
12 | trap 'echo "An error occurred at line $LINENO"; exit 1' EXIT | 12 | trap 'echo "An error occurred in sfsnapshotgit at line $LINENO"; exit 1' EXIT |
13 | 13 | ||
14 | # Send all command output to STDERR while allowing us to write to STDOUT | 14 | # Send all command output to STDERR while allowing us to write to STDOUT |
15 | # using fd 3 | 15 | # using fd 3 |
@@ -46,7 +46,8 @@ git reset --hard | |||
46 | git clean -qfdx | 46 | git clean -qfdx |
47 | # Any branch used to create snapshots must already exist | 47 | # Any branch used to create snapshots must already exist |
48 | git checkout "$HEAD" | 48 | git checkout "$HEAD" |
49 | git pull "$SFSNAP_ORIGIN" "$HEAD" | 49 | git fetch "$SFSNAP_ORIGIN" "$HEAD" |
50 | git reset --hard "$SFSNAP_ORIGIN"/"$HEAD" | ||
50 | # Tags are important for git-describe | 51 | # Tags are important for git-describe |
51 | git fetch --tags "$SFSNAP_ORIGIN" | 52 | git fetch --tags "$SFSNAP_ORIGIN" |
52 | 53 | ||