From fedbb7dc89c13d77f44a91e55415d96fea24b48c Mon Sep 17 00:00:00 2001 From: Edward Lemur Date: Thu, 22 Aug 2019 21:00:13 +0000 Subject: [PATCH] update_depot_tools: Use git checkout -q origin/master Bug: 996359 Change-Id: I7c87fd824103c91c1dd5b9b8975354732e5eb0a7 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1765839 Auto-Submit: Edward Lesmes Reviewed-by: Robbie Iannucci Commit-Queue: Robbie Iannucci --- 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 693b1e1cd..12e6a9605 100755 --- a/update_depot_tools +++ b/update_depot_tools @@ -101,7 +101,7 @@ function update_git_repo { git fetch -q origin &> /dev/null local REBASE_TXT STATUS - CHECKOUT_TXT=$(git checkout origin/master 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 5fa586b49..978623d72 100644 --- a/update_depot_tools.bat +++ b/update_depot_tools.bat @@ -51,7 +51,7 @@ for /F %%x in ('git config --get remote.origin.url') DO ( ) ) call git fetch -q origin > NUL -call git checkout origin/master > NUL +call git checkout -q origin/master > NUL if errorlevel 1 ( echo Failed to update depot_tools. goto :EOF