InTheForest/chromium_depot_tools
1
0
Fork 0
mirror of https://chromium.googlesource.com/chromium/tools/depot_tools.git synced 2026-01-11 10:41:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fetch all refs/heads/* on depot_tools update

Browse Source 
If user downloaded depot_tools.zip before 2021-03-11, it contained only
fetch for refs/heads/master. As main branch is a new default branch,
users need to update fetch ref in order to fetch chanes from main
branch.

R=ehmaldonado@google.com

Bug: 1187238
Change-Id: I78041fc74f1bb505db375b9c1dced38cdfc9b144
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2753834
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
Commit-Queue: Josip Sokcevic <sokcevic@google.com>
This commit is contained in:
Josip Sokcevic
2021-03-15 21:35:13 +00:00
committed by LUCI CQ
parent ef6fe0d655
commit 593a6b575b
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
update_depot_tools
View File

@@ -99,9 +99,14 @@ function update_git_repo {
fi
fi
# depot_tools.zip archives generated before 2021-03-12 have instruction to
# fetch only from old default git branch. Such branch won't be available
# evenutally, so fetch config needs to be updated.
git config --unset-all remote.origin.fetch
git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/*
git fetch -q origin &> /dev/null
local CHECKOUT_TXT STATUS
CHECKOUT_TXT=$(git checkout -q origin/master 2>&1)
CHECKOUT_TXT=$(git checkout -q origin/main 2>&1)
STATUS=$?
if [[ $STATUS -ne 0 ]]; then
echo "depot_tools update failed. Conflict in $base_dir" >&2

7
update_depot_tools.bat
View File

@@ -51,8 +51,13 @@ for /F %%x in ('git config --get remote.origin.url') DO (
)
)
)
:: depot_tools.zip archives generated before 2021-03-12 have instruction to
:: fetch only from old default git branch. Such branch won't be available
:: evenutally, so fetch config needs to be updated.
call git config --unset-all remote.origin.fetch
call git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/*
call git fetch -q origin > NUL
call git checkout -q origin/master > NUL
call git checkout -q origin/main > NUL
if errorlevel 1 (
echo Failed to update depot_tools.
goto :EOF