Skip to content

Commit 00772a3

Browse files
committed
scripts: make git-fetch-dev more robust
1 parent 41bc58c commit 00772a3

1 file changed

Lines changed: 7 additions & 3 deletions

File tree

scripts/git-fetch-dev.sh

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,14 @@ GIT_BRANCH=${2:-master}
99

1010
cd "$ROOT"
1111
git fetch "$GIT_ORIGIN"
12-
git reset --hard "$GIT_ORIGIN/$GIT_BRANCH"
13-
14-
DEVTOOLS_SUBMODULE_COMMIT=$(git ls-tree HEAD | grep "devtools-frontend" | cut -d " " -f 3 | cut -d$'\t' -f 1)
12+
REMOTE_HEAD="$GIT_ORIGIN/$GIT_BRANCH"
13+
DEVTOOLS_SUBMODULE_COMMIT=$(git ls-tree "$REMOTE_HEAD" | grep "devtools-frontend" | cut -d " " -f 3 | cut -d$'\t' -f 1)
1514

1615
cd devtools-frontend
1716
git fetch "$GIT_ORIGIN" HEAD
17+
18+
cd "$ROOT"
19+
git reset --hard "$REMOTE_HEAD"
20+
21+
cd devtools-frontend
1822
git checkout "$DEVTOOLS_SUBMODULE_COMMIT"

0 commit comments

Comments
 (0)