From 89d2cc1ec4edc468a765116bf8c83a6f517e4422 Mon Sep 17 00:00:00 2001 From: Josip Sokcevic Date: Wed, 10 Mar 2021 22:50:14 +0000 Subject: [PATCH] Revert "Update depot_tools using main branch" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit c2c576e9404d0a8fd14649f79fff13ea0d46b4e1. Reason for revert: windows zip archived linked in documentation only fetches master branch, so that needs to resolved first. Original change's description: > 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 > Reviewed-by: Edward Lesmes Change-Id: I873f84f8fbe3a6cde60955ca63eb81e6976dd1f8 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2748946 Auto-Submit: Josip Sokcevic Commit-Queue: Rubber Stamper Bot-Commit: Rubber Stamper --- update_depot_tools | 2 +- update_depot_tools.bat | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/update_depot_tools b/update_depot_tools index 677befa28..417b15d5a 100755 --- a/update_depot_tools +++ b/update_depot_tools @@ -101,7 +101,7 @@ function update_git_repo { git fetch -q origin &> /dev/null local CHECKOUT_TXT STATUS - CHECKOUT_TXT=$(git checkout -q origin/main 2>&1) + CHECKOUT_TXT=$(git checkout -q origin/master 2>&1) STATUS=$? if [[ $STATUS -ne 0 ]]; then echo "depot_tools update failed. Conflict in $base_dir" >&2 diff --git a/update_depot_tools.bat b/update_depot_tools.bat index 11d8bc3e9..4df4d44d8 100644 --- a/update_depot_tools.bat +++ b/update_depot_tools.bat @@ -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/main > NUL +call git checkout -q origin/master > NUL if errorlevel 1 ( echo Failed to update depot_tools. goto :EOF