Add --no-merges to roll_dep.py

roll_dep.py

Index: roll_dep.py
diff --git a/roll_dep.py b/roll_dep.py
index 9097b832176dc8df357ef939ad1b7803fc2c7959..c95db187fb5d4482da47ab7dca24d3fedee8ba7a 100755
--- a/roll_dep.py
+++ b/roll_dep.py
@@ -116,7 +116,8 @@ def roll(root, deps_dir, roll_to, key, reviewers, bug, no_log, log_limit):
       ['git', 'config', 'remote.origin.url'], cwd=full_dir).strip()
   log_url = get_log_url(upstream_url, head, roll_to)
   logs = check_output(

[M-A Ruel, 2015/10/07 17:13:03]

Let's do instead:
cmd = [
  'git', 'log', commit_range, '--date=short', '--format=%ad %ae %s',
'--no-merges',
]

then

log_section += '$ %s\n' % ' '.join(cmd)

-      ['git', 'log', commit_range, '--date=short', '--format=%ad %ae %s'],
+      ['git', 'log', commit_range, '--date=short', '--format=%ad %ae %s',
+        '--no-merges'],
       cwd=full_dir)
   logs = re.sub(r'(?m)^(\d\d\d\d-\d\d-\d\d [^@]+)@[^ ]+( .*)$', r'\1\2', logs)
   nb_commits = logs.count('\n')
@@ -130,8 +131,8 @@ def roll(root, deps_dir, roll_to, key, reviewers, bug, no_log, log_limit):
   log_section = ''
   if log_url:
     log_section = log_url + '\n\n'
-  log_section += '$ git log %s --date=short --format=\'%%ad %%ae %%s\'\n' % (
-      commit_range)
+  log_section += '$ git log %s ' % (commit_range)
+  log_section += '--date=short --format=\'%ad %ae %s\' --no-merges\n'
   if not no_log and should_show_log(upstream_url):
     if logs.count('\n') > log_limit:
       # Keep the first N log entries.