From 011b1695cb4244ed1277763eafa345157bf63f82 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Apr 01 2019 08:29:40 +0000
Subject: User the user's default email when rebasing


We used to use a dummy email address when rebasing. With this
commit we are instead using the default email address of the user
asking for the rebase.

Fixes https://pagure.io/pagure/issue/4379

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

---

diff --git a/pagure/lib/git.py b/pagure/lib/git.py
index 166747c..31253c1 100644
--- a/pagure/lib/git.py
+++ b/pagure/lib/git.py
@@ -1856,7 +1856,7 @@ def merge_pull_request(session, request, username, domerge=True):
     return "Changes merged!"
 
 
-def rebase_pull_request(request, username):
+def rebase_pull_request(session, request, username):
     """ Rebase the specified pull-request.
 
     Args:
@@ -1871,6 +1871,7 @@ def rebase_pull_request(request, username):
 
     """
     _log.info("%s asked to rebase the pull-request: %s", username, request)
+    user = pagure.lib.query.get_user(session, username)
 
     if request.remote:
         # Get the fork
@@ -1941,7 +1942,7 @@ def rebase_pull_request(request, username):
         # Configure git for that user
         command = ["git", "config", "user.name", username]
         _run_command(command)
-        command = ["git", "config", "user.email", "%s@pagure" % username]
+        command = ["git", "config", "user.email", user.default_email]
         _run_command(command)
 
         # Do the rebase
diff --git a/pagure/lib/tasks.py b/pagure/lib/tasks.py
index 193dcf3..05bbe39 100644
--- a/pagure/lib/tasks.py
+++ b/pagure/lib/tasks.py
@@ -719,7 +719,7 @@ def rebase_pull_request(
             request.id,
             request.uid,
         )
-        pagure.lib.git.rebase_pull_request(request, user_rebaser)
+        pagure.lib.git.rebase_pull_request(session, request, user_rebaser)
 
     update_pull_request(request.uid, username=user_rebaser)
     # Schedule refresh of all opened PRs