scripts: make git-fetch-dev more robust

binaryage · Nov 10, 2020 · 00772a3 · 00772a3
1 parent 41bc58c
commit 00772a3
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/scripts/git-fetch-dev.sh b/scripts/git-fetch-dev.sh
@@ -9,10 +9,14 @@ GIT_BRANCH=${2:-master}
 
 cd "$ROOT"
 git fetch "$GIT_ORIGIN"
-git reset --hard "$GIT_ORIGIN/$GIT_BRANCH"
-
-DEVTOOLS_SUBMODULE_COMMIT=$(git ls-tree HEAD | grep "devtools-frontend" | cut -d " " -f 3 | cut -d$'\t' -f 1)
+REMOTE_HEAD="$GIT_ORIGIN/$GIT_BRANCH"
+DEVTOOLS_SUBMODULE_COMMIT=$(git ls-tree "$REMOTE_HEAD" | grep "devtools-frontend" | cut -d " " -f 3 | cut -d$'\t' -f 1)
 
 cd devtools-frontend
 git fetch "$GIT_ORIGIN" HEAD
+
+cd "$ROOT"
+git reset --hard "$REMOTE_HEAD"
+
+cd devtools-frontend
 git checkout "$DEVTOOLS_SUBMODULE_COMMIT"