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

Revert "Update depot_tools using main branch"

Browse Source 
This reverts commit c2c576e940.

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 <sokcevic@google.com>
> Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>

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 <sokcevic@google.com>
Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
This commit is contained in:
Josip Sokcevic
2021-03-10 22:50:14 +00:00
committed by LUCI CQ
parent c2c576e940
commit 89d2cc1ec4
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/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