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

Update depot_tools using main branch

Browse Source 
R=ehmaldonado@chromium.org

Change-Id: Ie8d00331d649fa33158bb78d0bb64eacd121f044
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2748935
Commit-Queue: Josip Sokcevic <sokcevic@google.com>
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
This commit is contained in:
Josip Sokcevic
2021-03-10 19:48:32 +00:00
committed by LUCI CQ
parent 7e3ad9eeb8
commit c2c576e940
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
update_depot_tools
View File

@@ -101,7 +101,7 @@ function update_git_repo {
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

2
update_depot_tools.bat
View File

@@ -52,7 +52,7 @@ for /F %%x in ('git config --get remote.origin.url') DO (
)
)
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