From 8ccb3838fc9540e331b41f788fac7b1b95b4d11d Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Apr 20 2014 10:01:00 +0000
Subject: Drop our own check that the changes were merged to rely on the one of pygit2


---

diff --git a/progit/fork.py b/progit/fork.py
index 19fc0f1..a2960d1 100644
--- a/progit/fork.py
+++ b/progit/fork.py
@@ -175,14 +175,6 @@ def merge_request_pull(repo, requestid, username=None):
     parentpath = os.path.join(APP.config['GIT_FOLDER'], request.repo.path)
     orig_repo = pygit2.Repository(parentpath)
 
-    # Check if changes have been merged
-    if orig_repo.get(request.stop_id, None):
-        flask.flash('These changes have already been merged.', 'error')
-        # Update status
-        progit.lib.close_pull_request(SESSION, request)
-        SESSION.commit()
-        return flask.redirect(error_output)
-
     # Clone the original repo into a temp folder
     newpath = tempfile.mkdtemp()
     new_repo = pygit2.clone_repository(parentpath, newpath)