Skip to content

Commit ebceaf4

Browse files
authored
chore: make prepare_checkaout update browser_upstream/master (#2209)
1 parent 28845e5 commit ebceaf4

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

browser_patches/prepare_checkout.sh

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -91,15 +91,13 @@ else
9191
git remote add $REMOTE_BROWSER_UPSTREAM $REMOTE_URL
9292
fi
9393

94-
# Check if we have the $BASE_REVISION commit in GIT
94+
# If not, fetch from REMOTE_BROWSER_UPSTREAM and check one more time.
95+
git fetch $REMOTE_BROWSER_UPSTREAM $BASE_BRANCH
9596
if ! git cat-file -e $BASE_REVISION^{commit}; then
96-
# If not, fetch from REMOTE_BROWSER_UPSTREAM and check one more time.
97-
git fetch $REMOTE_BROWSER_UPSTREAM $BASE_BRANCH
98-
if ! git cat-file -e $BASE_REVISION^{commit}; then
99-
echo "ERROR: $FRIENDLY_CHECKOUT_PATH/ does not include the BASE_REVISION (@$BASE_REVISION). Wrong revision number?"
100-
exit 1
101-
fi
97+
echo "ERROR: $FRIENDLY_CHECKOUT_PATH/ does not include the BASE_REVISION (@$BASE_REVISION). Wrong revision number?"
98+
exit 1
10299
fi
100+
103101
echo "-- checking $FRIENDLY_CHECKOUT_PATH repo has BASE_REVISION (@$BASE_REVISION) commit - OK"
104102

105103
# Check out the $BASE_REVISION

0 commit comments

Comments
 (0)