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 <ehmaldonado@chromium.org>
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
Commit-Queue: Robbie Iannucci <iannucci@chromium.org>
changes/39/1765839/2
Edward Lemur 6 years ago committed by Commit Bot
parent c13c5f67a1
commit fedbb7dc89

@ -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

@ -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

Loading…
Cancel
Save