diff --git a/recipes/recipe_modules/bot_update/resources/bot_update.py b/recipes/recipe_modules/bot_update/resources/bot_update.py index 6d56d8a6c..3e5361875 100755 --- a/recipes/recipe_modules/bot_update/resources/bot_update.py +++ b/recipes/recipe_modules/bot_update/resources/bot_update.py @@ -339,11 +339,6 @@ def gclient_sync( fd, gclient_output_file = tempfile.mkstemp(suffix='.json') os.close(fd) - # Some bots don't have git user name/email configured, which causes problems - # when rebasing. - git('config', 'user.name', 'chrome-bot') - git('config', 'user.email', 'chrome-bot@chromium.org') - args = ['sync', '--verbose', '--reset', '--force', '--ignore_locks', '--output-json', gclient_output_file, '--nohooks', '--noprehooks', '--delete_unversioned_trees'] diff --git a/recipes/trigger_recipe_roller.txt b/recipes/trigger_recipe_roller.txt index a814237e3..c190de528 100644 --- a/recipes/trigger_recipe_roller.txt +++ b/recipes/trigger_recipe_roller.txt @@ -1,4 +1,4 @@ -No-op file. Edit this to kick recipes. +No-op file. Edit this to kick recipes. (Did they do something wrong?) This is a beginning of a story in this silly file. Once upon a time, a budding web browser dev team needed a CI system.