From 045feb08c99fdb96928f14847bdebd5798a4011f Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Feb 10 2016 14:44:43 +0000
Subject: Use the same structure as for the others


First check if we do the merge, if not then return the status

---

diff --git a/pagure/lib/git.py b/pagure/lib/git.py
index 995764f..bca19a9 100644
--- a/pagure/lib/git.py
+++ b/pagure/lib/git.py
@@ -1064,23 +1064,25 @@ def merge_pull_request(
                 session.commit()
                 return 'CONFLICTS'
 
-        if not domerge:
+        if domerge:
+            head = new_repo.lookup_reference('HEAD').get_object()
+            user_obj = pagure.lib.__get_user(session, username)
+            author = pygit2.Signature(user_obj.fullname, user_obj.default_email)
+            new_repo.create_commit(
+                'refs/heads/%s' % request.branch,
+                author,
+                author,
+                'Merge #%s `%s`' % (request.id, request.title),
+                tree,
+                [head.hex, repo_commit.oid.hex])
+            PagureRepo.push(ori_remote, refname)
+
+        else:
             request.merge_status = 'MERGE'
             session.commit()
             shutil.rmtree(newpath)
             return 'MERGE'
 
-        head = new_repo.lookup_reference('HEAD').get_object()
-        user_obj = pagure.lib.__get_user(session, username)
-        author = pygit2.Signature(user_obj.fullname, user_obj.default_email)
-        new_repo.create_commit(
-            'refs/heads/%s' % request.branch,
-            author,
-            author,
-            'Merge #%s `%s`' % (request.id, request.title),
-            tree,
-            [head.hex, repo_commit.oid.hex])
-        PagureRepo.push(ori_remote, refname)
 
     # Update status
     pagure.lib.close_pull_request(