Skip to content

Commit 8402049

Browse files
authored
git reset --hard $IDF_COMMIT for cherry-pick
1 parent 1c50ef5 commit 8402049

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

tools/install-esp-idf.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@ if [ "$IDF_TAG" ]; then
5252
git -C "$IDF_PATH" checkout "tags/$IDF_TAG"
5353
idf_was_installed="1"
5454
elif [ "$IDF_COMMIT" ]; then
55+
git remote add cherrypick https://github.com/$IDF_REPO.git
56+
git fetch cherrypick release/v5.3
5557
echo "Checkout commit $IDF_COMMIT from branch $IDF_BRANCH"
5658
git -C "$IDF_PATH" checkout "$IDF_COMMIT"
57-
git switch -c work
59+
git reset --hard $IDF_COMMIT
5860
git submodule update --recursive
59-
git remote add cherrypick https://github.com/$IDF_REPO.git
60-
git fetch cherrypick release/v5.3
6161
git cherry-pick d3354f2c65368f716dee48ed8bccf33372bf1c5e
6262
commit_predefined="1"
6363
fi

0 commit comments

Comments
 (0)