From 90e958b3b882b4d0c4457f8c86398bbde10a5208 Mon Sep 17 00:00:00 2001 From: Andrii Shyshkalov Date: Tue, 16 May 2017 20:41:34 +0200 Subject: [PATCH] bot_update: set fake user.{name,email} when running rebase. R=agable@chromium.org,sergeyberezin@chromium.org,iannucci@chromium.org BUG=722853 Change-Id: I9bd8c259a87cc65e320e99d9c5e18838b970d543 Reviewed-on: https://chromium-review.googlesource.com/505495 Reviewed-by: Sergey Berezin Reviewed-by: Aaron Gable --- recipes/recipe_modules/bot_update/resources/bot_update.py | 4 +++- 1 file changed, 3 insertions(+), 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 8e68313c54..aaf400e55a 100755 --- a/recipes/recipe_modules/bot_update/resources/bot_update.py +++ b/recipes/recipe_modules/bot_update/resources/bot_update.py @@ -672,7 +672,9 @@ def apply_gerrit_ref(gerrit_repo, gerrit_ref, root, gerrit_reset, ok = False git('checkout', '-b', temp_branch_name, cwd=root) try: - git('rebase', base_rev, cwd=root, tries=1) + git('-c', 'user.name=chrome-bot', + '-c', 'user.email=chrome-bot@chromium.org', + 'rebase', base_rev, cwd=root, tries=1) except SubprocessFailed: # Abort the rebase since there were failures. git('rebase', '--abort', cwd=root)