From 952aa7a9c1033382880d5478c5f96506882ba4b5 Mon Sep 17 00:00:00 2001
From: Andrew Kelley <andrew@ziglang.org>
Date: Fri, 25 Oct 2019 04:26:22 -0400
Subject: [PATCH] ci: perform git config inside zig git repo dir

---
 ci/azure/macos_script  | 3 ++-
 ci/srht/freebsd_script | 9 +++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/ci/azure/macos_script b/ci/azure/macos_script
index d5c986dd47..f41c036da1 100755
--- a/ci/azure/macos_script
+++ b/ci/azure/macos_script
@@ -67,11 +67,12 @@ else
   s3cmd put -P --add-header="cache-control: public, max-age=31536000, immutable" "$CACHE_BASENAME.tar.xz" "s3://ziglang.org/builds/$CACHE_BASENAME.tar.xz"
 fi
 
+cd $ZIGDIR
+
 # Make the `zig version` number consistent.
 # This will affect the cmake command below.
 git config core.abbrev 9
 
-cd $ZIGDIR
 mkdir build
 cd build
 cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=$PREFIX -DCMAKE_INSTALL_PREFIX=$(pwd)/release -DZIG_STATIC=ON
diff --git a/ci/srht/freebsd_script b/ci/srht/freebsd_script
index 5010fad5d8..55c06de33f 100755
--- a/ci/srht/freebsd_script
+++ b/ci/srht/freebsd_script
@@ -8,15 +8,16 @@ CACHE_BASENAME="llvm+clang-9.0.0-freebsd-x86_64-release"
 PREFIX="$HOME/$CACHE_BASENAME"
 JOBS="-j$(sysctl -n hw.ncpu)"
 
-# Make the `zig version` number consistent.
-# This will affect the cmake command below.
-git config core.abbrev 9
-
 cd $HOME
 wget -nv "https://ziglang.org/builds/$CACHE_BASENAME.tar.xz"
 tar xf "$CACHE_BASENAME.tar.xz"
 
 cd $ZIGDIR
+
+# Make the `zig version` number consistent.
+# This will affect the cmake command below.
+git config core.abbrev 9
+
 mkdir build
 cd build
 cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=$PREFIX "-DCMAKE_INSTALL_PREFIX=$(pwd)/release" -DZIG_STATIC=ON