Commit c2c576e9 authored by Josip Sokcevic's avatar Josip Sokcevic Committed by LUCI CQ

Update depot_tools using main branch

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: 's avatarEdward Lesmes <ehmaldonado@chromium.org>
parent 7e3ad9ee
...@@ -101,7 +101,7 @@ function update_git_repo { ...@@ -101,7 +101,7 @@ function update_git_repo {
git fetch -q origin &> /dev/null git fetch -q origin &> /dev/null
local CHECKOUT_TXT STATUS local CHECKOUT_TXT STATUS
CHECKOUT_TXT=$(git checkout -q origin/master 2>&1) CHECKOUT_TXT=$(git checkout -q origin/main 2>&1)
STATUS=$? STATUS=$?
if [[ $STATUS -ne 0 ]]; then if [[ $STATUS -ne 0 ]]; then
echo "depot_tools update failed. Conflict in $base_dir" >&2 echo "depot_tools update failed. Conflict in $base_dir" >&2
......
...@@ -52,7 +52,7 @@ for /F %%x in ('git config --get remote.origin.url') DO ( ...@@ -52,7 +52,7 @@ for /F %%x in ('git config --get remote.origin.url') DO (
) )
) )
call git fetch -q origin > NUL call git fetch -q origin > NUL
call git checkout -q origin/master > NUL call git checkout -q origin/main > NUL
if errorlevel 1 ( if errorlevel 1 (
echo Failed to update depot_tools. echo Failed to update depot_tools.
goto :EOF goto :EOF
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment