From 193013dd8eeccb2b8e677ca8e440cf79f4a55a06 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Nov 19 2015 18:46:04 +0000
Subject: Invert how we check if a PR can be merged


Otherwise it's doing the opposite of how we check the diff

---

diff --git a/pagure/lib/git.py b/pagure/lib/git.py
index 1569659..7bbe082 100644
--- a/pagure/lib/git.py
+++ b/pagure/lib/git.py
@@ -946,7 +946,7 @@ def merge_pull_request(
 
     # Update the start and stop commits in the DB, one last time
     diff_commits = diff_pull_request(
-        session, request, PagureRepo(parentpath), fork_obj,
+        session, request, fork_obj, PagureRepo(parentpath),
         requestfolder=request_folder, with_diff=False)[0]
 
     if request.project.settings.get(