Skip to content

Commit 881efdf

Browse files
authored
Merge pull request #29 from jendo42/devel
fixed issue with incorrect/ambigous repo ref
2 parents 62c3aa4 + bbaa9f4 commit 881efdf

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

scripts/001-binutils.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ fi
2525
if test ! -d "$REPO_FOLDER"; then
2626
git clone --depth 1 -b "$REPO_REF" "$REPO_URL" "$REPO_FOLDER"
2727
else
28-
git -C "$REPO_FOLDER" fetch origin
29-
git -C "$REPO_FOLDER" reset --hard "origin/$REPO_REF"
30-
git -C "$REPO_FOLDER" checkout "$REPO_REF"
28+
git -C "$REPO_FOLDER" remote set-url origin "$REPO_URL"
29+
git -C "$REPO_FOLDER" fetch origin "$REPO_REF" --depth=1
30+
git -C "$REPO_FOLDER" checkout -f FETCH_HEAD
3131
fi
3232

3333
cd "$REPO_FOLDER"

scripts/002-gcc-stage1.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ fi
2525
if test ! -d "$REPO_FOLDER"; then
2626
git clone --depth 1 -b "$REPO_REF" "$REPO_URL" "$REPO_FOLDER"
2727
else
28-
git -C "$REPO_FOLDER" fetch origin
29-
git -C "$REPO_FOLDER" reset --hard "origin/$REPO_REF"
30-
git -C "$REPO_FOLDER" checkout "$REPO_REF"
28+
git -C "$REPO_FOLDER" remote set-url origin "$REPO_URL"
29+
git -C "$REPO_FOLDER" fetch origin "$REPO_REF" --depth=1
30+
git -C "$REPO_FOLDER" checkout -f FETCH_HEAD
3131
fi
3232

3333
cd "$REPO_FOLDER"

0 commit comments

Comments
 (0)