From bcb5c114804fa927d401914217ef617647af7232 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Apr 13 2017 14:10:29 +0000
Subject: Fix logic around merge_pull_request and diff_pull_request


Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>

---

diff --git a/pagure/lib/git.py b/pagure/lib/git.py
index 020dad3..4172180 100644
--- a/pagure/lib/git.py
+++ b/pagure/lib/git.py
@@ -1188,7 +1188,7 @@ def merge_pull_request(
     # Update the start and stop commits in the DB, one last time
     diff_commits = diff_pull_request(
         session, request, fork_obj, PagureRepo(parentpath),
-        requestfolder=request_folder, with_diff=False)[0]
+        requestfolder=request_folder, with_diff=False)
 
     if request.project.settings.get(
             'Enforce_signed-off_commits_in_pull-request', False):
@@ -1535,7 +1535,7 @@ def diff_pull_request(
     if with_diff:
         return (diff_commits, diff)
     else:
-        diff_commits
+        return diff_commits
 
 
 def get_git_tags(project):
diff --git a/pagure/ui/fork.py b/pagure/ui/fork.py
index df2b502..45befbc 100644
--- a/pagure/ui/fork.py
+++ b/pagure/ui/fork.py
@@ -302,7 +302,7 @@ def request_pull_patch(repo, requestid, username=None, namespace=None):
             diff_commits = pagure.lib.git.diff_pull_request(
                 SESSION, request, repo_obj, orig_repo,
                 requestfolder=APP.config['REQUESTS_FOLDER'],
-                with_diff=False)[0]
+                with_diff=False)
         except pagure.exceptions.PagureException as err:
             flask.flash(err.message, 'error')
             return flask.redirect(flask.url_for(