Merge pull request #29 from jendo42/devel

fixed issue with incorrect/ambigous repo ref
ps2dev · Jul 4, 2024 · 881efdf · 881efdf
2 parents 62c3aa4 + bbaa9f4
commit 881efdf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/scripts/001-binutils.sh b/scripts/001-binutils.sh
@@ -25,9 +25,9 @@ fi
 if test ! -d "$REPO_FOLDER"; then
   git clone --depth 1 -b "$REPO_REF" "$REPO_URL" "$REPO_FOLDER"
 else
-  git -C "$REPO_FOLDER" fetch origin
-  git -C "$REPO_FOLDER" reset --hard "origin/$REPO_REF"
-  git -C "$REPO_FOLDER" checkout "$REPO_REF"
+  git -C "$REPO_FOLDER" remote set-url origin "$REPO_URL"
+  git -C "$REPO_FOLDER" fetch origin "$REPO_REF" --depth=1
+  git -C "$REPO_FOLDER" checkout -f FETCH_HEAD
 fi
 
 cd "$REPO_FOLDER"

diff --git a/scripts/002-gcc-stage1.sh b/scripts/002-gcc-stage1.sh
@@ -25,9 +25,9 @@ fi
 if test ! -d "$REPO_FOLDER"; then
   git clone --depth 1 -b "$REPO_REF" "$REPO_URL" "$REPO_FOLDER"
 else
-  git -C "$REPO_FOLDER" fetch origin
-  git -C "$REPO_FOLDER" reset --hard "origin/$REPO_REF"
-  git -C "$REPO_FOLDER" checkout "$REPO_REF"
+  git -C "$REPO_FOLDER" remote set-url origin "$REPO_URL"
+  git -C "$REPO_FOLDER" fetch origin "$REPO_REF" --depth=1
+  git -C "$REPO_FOLDER" checkout -f FETCH_HEAD
 fi
 
 cd "$REPO_FOLDER"