pre-upload: skip merge commits

We don't have any checks that apply to merge commits, so skip them.

TEST=`repo upload` with merge commits skips them

Change-Id: I27441d1b052a6930c458b02fa754bc543b5f4c89
Tested-by: Mike Frysinger <>
Commit-Ready: Mike Frysinger <>
Legacy-Commit-Queue: Commit Bot <>
Reviewed-by: Allen Webb <>
diff --git a/ b/
index bb73ee0..f2938d5 100755
--- a/
+++ b/
@@ -401,7 +401,8 @@
 def _get_commits():
   """Returns a list of commits for this review."""
-  cmd = ['git', 'log', '%s..' % _get_upstream_branch(), '--format=%H']
+  cmd = ['git', 'log', '--no-merges', '--format=%H',
+         '%s..' % _get_upstream_branch()]
   return _run_command(cmd).split()