Use branch names instead

Author: Raghuveer Devulapalli

scripts/branch-compare.sh

@@ -3,14 +3,27 @@ set -e
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 BASE_DIR=$(dirname $SCRIPT_DIR)
 branch=$(git rev-parse --abbrev-ref HEAD)
-br_commit=$(git rev-parse $branch)
-main_commit=$(git rev-parse main)
+#br_commit=$(git rev-parse $branch)
+#main_commit=$(git rev-parse main)
 echo "Comparing main branch with $branch"
 
 build_branch() {
     dir_name=$1
     if [ ! -d $dir_name ]; then
         git clone -b $branch ${BASE_DIR} $dir_name
+    else
+        # if it exists, just update it
+        cd $dir_name
+        git fetch origin
+        git rebase origin/$branch
+        # rebase fails with conflict, delete and start over
+        if [ "$?" != 0 ]; then
+            cd ..
+            rm -rf $branch
+            git clone -b $branch ${BASE_DIR} $dir_name
+        else
+            cd ..
+        fi
     fi
     cd $dir_name
     meson setup --warnlevel 0 --buildtype plain builddir
@@ -25,10 +38,10 @@ if [ ! -d google-benchmark ]; then
     git clone https://github.com/google/benchmark google-benchmark
 fi
 compare=$(realpath google-benchmark/tools/compare.py)
-build_branch $br_commit
-build_branch $main_commit
-baseline=$(realpath ${main_commit}/builddir/benchexe)
-contender=$(realpath ${br_commit}/builddir/benchexe)
+build_branch $branch
+build_branch "main"
+baseline=$(realpath ${branch}/builddir/benchexe)
+contender=$(realpath main/builddir/benchexe)
 
 if [ -z "$1" ]; then
     echo "Comparing all benchmarks .."