From ad6a1b68133ec6acc427544e33993d46948b4371 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Mar 20 2017 17:17:19 +0000 Subject: Exclude the commit shared between the branches from the diff list --- diff --git a/pagure/internal/__init__.py b/pagure/internal/__init__.py index 9e4733b..19e89a1 100644 --- a/pagure/internal/__init__.py +++ b/pagure/internal/__init__.py @@ -303,13 +303,14 @@ def get_pull_request_ready_branch(): except StopIteration: pass try: - com = branch_walker.next() - branch_commits.append(com.hex) + branch_commit = branch_walker.next() except StopIteration: - break + branch_commit = None - if main_commits.intersection(set(branch_commits)): + if main_commits.intersection(set( + branch_commits + [branch_commit.hex])): break + branch_commits.append(branch_commit.hex) if branch_commits: branches[branchname] = branch_commits