From b5aac082a2a055c76f5ab062adab24fdc5d521fd Mon Sep 17 00:00:00 2001
From: Julen Landa Alustiza <jlanda@fedoraproject.org>
Date: Jul 03 2019 06:02:19 +0000
Subject: Fix git terminology on rebase commits


---

diff --git a/pagure/lib/git.py b/pagure/lib/git.py
index 30c927c..e13344b 100644
--- a/pagure/lib/git.py
+++ b/pagure/lib/git.py
@@ -2226,7 +2226,7 @@ def diff_pull_request(
                 and request.commit_start != first_commit.oid.hex
             ):
                 pr_action = "rebased"
-                commenttext = "rebased onto %s" % first_commit.oid.hex
+                commenttext = "rebased as %s" % first_commit.oid.hex
         request.commit_start = first_commit.oid.hex
         request.commit_stop = diff_commits[0].oid.hex
         session.add(request)
diff --git a/tests/test_pagure_flask_rebase.py b/tests/test_pagure_flask_rebase.py
index 2284339..86a4404 100644
--- a/tests/test_pagure_flask_rebase.py
+++ b/tests/test_pagure_flask_rebase.py
@@ -206,7 +206,7 @@ class PagureRebasetests(tests.Modeltests):
             output = self.app.get("/test/pull-request/1")
             self.assertEqual(output.status_code, 200)
             output_text = output.get_data(as_text=True)
-            self.assertIn("rebased onto", output_text)
+            self.assertIn("rebased as", output_text)
             repo = pagure.lib.query._get_project(self.session, "test")
             self.assertEqual(
                 repo.requests[0].comments[0].user.username, "pingou"
@@ -263,7 +263,7 @@ class PagureRebasetests(tests.Modeltests):
             output = self.app.get("/test/pull-request/1")
             self.assertEqual(output.status_code, 200)
             output_text = output.get_data(as_text=True)
-            self.assertIn("rebased onto", output_text)
+            self.assertIn("rebased as", output_text)
             repo = pagure.lib.query._get_project(self.session, "test")
             self.assertEqual(repo.requests[0].comments[0].user.username, "foo")