Bug 1439758 - Handle case where merge only merges one commit (#485)

mozilla · Apr 3, 2018 · 5b468a4 · 5b468a4
1 parent 63484e9
commit 5b468a4
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/mozregression/bisector.py b/mozregression/bisector.py
@@ -287,7 +287,14 @@ def handle_merge(self):
             else:
                 return
         try:
-            # so, this is a merge. We can find the oldest and youngest
+            # so, this is a merge. see how many changesets are in it, if it
+            # is just one, we have our answer
+            if len(push.changesets) == 2:
+                LOG.info("Merge commit has only two revisions (one of which "
+                         "is the merge): we are done")
+                return
+
+            # Otherwise, we can find the oldest and youngest
             # changesets, and the branch where the merge comes from.
             oldest = push.changesets[0]['node']
             # exclude the merge commit