From 85755c1bdb72ec03ce1719469e56ac842a785813 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Mar 23 2014 13:30:49 +0000
Subject: Bug fix and variable name fix when showing the diff for a pull request


---

diff --git a/progit/fork.py b/progit/fork.py
index 9945308..f3d7268 100644
--- a/progit/fork.py
+++ b/progit/fork.py
@@ -535,8 +535,8 @@ def request_pull(username, repo, commitid=None):
     if not repo:
         flask.abort(404)
 
-    reponame = os.path.join(APP.config['FORK_FOLDER'], username, repo.path)
-    repo_obj = pygit2.Repository(reponame)
+    repopath = os.path.join(APP.config['FORK_FOLDER'], username, repo.path)
+    repo_obj = pygit2.Repository(repopath)
 
     parentname = os.path.join(APP.config['GIT_FOLDER'], repo.parent.path)
     orig_repo = pygit2.Repository(parentname)
@@ -562,8 +562,8 @@ def request_pull(username, repo, commitid=None):
             )
 
     elif orig_repo.is_empty:
-        repo_obj = repo_obj[repo_obj.head.target]
-        diff = repo_obj.tree.diff_to_tree(swap=True)
+        repo_commit = repo_obj[repo_obj.head.target]
+        diff = repo_commit.tree.diff_to_tree(swap=True)
     else:
         flask.flash(
             'Fork is empty, there are no commits to request pulling',
@@ -571,7 +571,6 @@ def request_pull(username, repo, commitid=None):
         return flask.redirect(flask.url_for(
             'view_fork_repo', username=username, repo=repo.name))
 
-
     html_diffs = []
     for diff in diffs:
         html_diffs.append(