From 2e5839266039aaaebc498198f548b0c3564f33fc Mon Sep 17 00:00:00 2001 From: Menno Finlay-Smits Date: Tue, 3 Apr 2018 12:19:45 +1200 Subject: [PATCH] Fetch reference branch in reference clone The reference revision fetched in the "current" repo didn't always make it across when cloning to the reference repo, resulting in "reference is not a tree" errors from git. --- perfcheck | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/perfcheck b/perfcheck index 84c45d7..dc49cff 100755 --- a/perfcheck +++ b/perfcheck @@ -47,9 +47,6 @@ reference_bench_output="$PWD/reference.bench" title "Building benchcheck tool" go build -o benchcheck/benchcheck ./benchcheck || exit 1 -title "Fetching upstream reference branch" -git fetch --depth=50 origin perfcheck-reference - title "Setting up reference branch" # Create a temporary GOPATH which gets removed on exit. @@ -64,6 +61,11 @@ set -e clone_dir=$ref_gopath/src/$GO_PACKAGE git clone --quiet . $clone_dir pushd $clone_dir > /dev/null + +title "Fetching upstream reference branch" +git remote add upstream https://github.com/jumptrading/influx-spout.git +git fetch --depth=10 upstream perfcheck-reference + git checkout --quiet -b perfcheck $REFERENCE_REVISION > /dev/null popd > /dev/null set +e