From a3ba888db8f00dce68cbd6e36fd058ae1d471bc1 Mon Sep 17 00:00:00 2001 From: Dan Jacques Date: Mon, 15 May 2017 17:57:50 -0700 Subject: [PATCH] [bot_update] Remove "git retry" call. The Git wrapper now implicitly retries, so this call is unnecessary. BUG=chromium:721450 TEST=None R=hinoka@chromium.org, iannucci@chromium.org Change-Id: I79e42aa050f6fec14506b685d379a76e8296fea3 Reviewed-on: https://chromium-review.googlesource.com/506493 Reviewed-by: Ryan Tseng Reviewed-by: Robbie Iannucci Commit-Queue: Daniel Jacques --- recipes/recipe_modules/bot_update/resources/bot_update.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/recipe_modules/bot_update/resources/bot_update.py b/recipes/recipe_modules/bot_update/resources/bot_update.py index baf8aeea1..8e68313c5 100755 --- a/recipes/recipe_modules/bot_update/resources/bot_update.py +++ b/recipes/recipe_modules/bot_update/resources/bot_update.py @@ -661,7 +661,7 @@ def apply_gerrit_ref(gerrit_repo, gerrit_ref, root, gerrit_reset, # command will do so. See http://crbug.com/692067. git('reset', '--hard', cwd=root) try: - git('retry', 'fetch', gerrit_repo, gerrit_ref, cwd=root, tries=1) + git('fetch', gerrit_repo, gerrit_ref, cwd=root, tries=1) git('checkout', 'FETCH_HEAD', cwd=root) if gerrit_rebase_patch_ref: