InTheForest/chromium_depot_tools
1
0
Fork 0
mirror of https://chromium.googlesource.com/chromium/tools/depot_tools.git synced 2026-01-11 18:51:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

update_depot_tools: Use git checkout -q origin/master

Browse Source 
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>
This commit is contained in:
Edward Lemur
2019-08-22 21:00:13 +00:00
committed by Commit Bot
parent c13c5f67a1
commit fedbb7dc89
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 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