From 35fe7644173408c817d7d01c9ee1b2f76abbd195 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Oct 11 2018 09:48:57 +0000
Subject: Do not notify twice when pushing commits to an open PR


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

---

diff --git a/pagure/lib/git.py b/pagure/lib/git.py
index c5dcbef..6b88900 100644
--- a/pagure/lib/git.py
+++ b/pagure/lib/git.py
@@ -1891,7 +1891,8 @@ def get_diff_info(repo_obj, orig_repo, branch_from, branch_to, prid=None):
     return (diff, diff_commits, orig_commit)
 
 
-def diff_pull_request(session, request, repo_obj, orig_repo, with_diff=True):
+def diff_pull_request(
+        session, request, repo_obj, orig_repo, with_diff=True, notify=True):
     """ Returns the diff and the list of commits between the two git repos
     mentionned in the given pull-request.
 
@@ -1963,20 +1964,21 @@ def diff_pull_request(session, request, repo_obj, orig_repo, with_diff=True):
         )
 
         if commenttext:
-            pagure.lib.add_pull_request_comment(
-                session,
-                request,
-                commit=None,
-                tree_id=None,
-                filename=None,
-                row=None,
-                comment="%s" % commenttext,
-                user=request.user.username,
-                notify=False,
-                notification=True,
-            )
-            session.commit()
             tasks.link_pr_to_ticket.delay(request.uid)
+            if notify:
+                pagure.lib.add_pull_request_comment(
+                    session,
+                    request,
+                    commit=None,
+                    tree_id=None,
+                    filename=None,
+                    row=None,
+                    comment="%s" % commenttext,
+                    user=request.user.username,
+                    notify=False,
+                    notification=True,
+                )
+                session.commit()
         pagure.lib.git.update_git(request, repo=request.project)
 
     if with_diff:
diff --git a/pagure/lib/tasks.py b/pagure/lib/tasks.py
index 89913b2..74c0329 100644
--- a/pagure/lib/tasks.py
+++ b/pagure/lib/tasks.py
@@ -1072,7 +1072,7 @@ def link_pr_to_ticket(self, session, pr_uid):
     orig_repo = pygit2.Repository(parentpath)
 
     diff_commits = pagure.lib.git.diff_pull_request(
-        session, request, repo_obj, orig_repo, with_diff=False
+        session, request, repo_obj, orig_repo, with_diff=False, notify=False
     )
 
     _log.info(