recipe_autoroller: pass --rietveld to git cl set-commit to match upload

recipes/recipe_modules/recipe_autoroller/api.py

 # Copyright 2016 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import hashlib
 import json
 import re
 
 from recipe_engine import recipe_api
 
@@ skipping 220 matching lines @@
       change_data = json.loads(cat_result.stdout)
       cat_result.presentation.links['Issue %s' % change_data['issue']] = (
           change_data['issue_url'])
       self.m.git('cl', 'issue', change_data['issue'], cwd=workdir)
       if change_data['diff_digest'] != diff_digest:
         need_to_upload = True
         rebase = True
       elif roll_result['trivial']:
         # We won't be uploading. Make sure trivial rolls don't get stuck
         # if previous CQ attempt failed because of flake.
-        self.m.git('cl', 'set-commit', cwd=workdir)
+        # Pass --rietveld flag to match upload args below.
+        self.m.git('cl', 'set-commit', '--rietveld', cwd=workdir)
 
     if need_to_upload:
       commit_message = (
           'Rebase' if rebase else get_commit_message(roll_result))
       if roll_result['trivial']:
         # Land immediately.
         upload_args = ['--use-commit-queue']
         if not rebase:
           commit_message += '\nTBR=%s\n' % ','.join(TRIVIAL_ROLL_TBR_EMAILS)
       else:
@@ skipping 23 matching lines @@
         'issue': m.group(1),
         'issue_url': m.group(2),
         'diff_digest': diff_digest,
       }
       issue_result.presentation.links['Issue %s' % change_data['issue']] = (
           change_data['issue_url'])
       self.m.gsutil.upload(
           self.m.json.input(change_data),
           'recipe-roller-cl-uploads',
           cfg_digest)