You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by ro...@apache.org on 2022/10/19 10:55:33 UTC

[arrow] branch master updated: ARROW-17025: [Dev] Remove github user name links from merge commit message (#14458)

This is an automated email from the ASF dual-hosted git repository.

rok pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/master by this push:
     new 962121062e ARROW-17025:  [Dev] Remove github user name links from merge commit message (#14458)
962121062e is described below

commit 962121062e4b13c148f24a6d4fa4b1a2f1be0d88
Author: Joris Van den Bossche <jo...@gmail.com>
AuthorDate: Wed Oct 19 12:55:23 2022 +0200

    ARROW-17025:  [Dev] Remove github user name links from merge commit message (#14458)
    
    Insert a space between the ``@`` and the username, to avoid it is an actual github reference
    
    Authored-by: Joris Van den Bossche <jo...@gmail.com>
    Signed-off-by: Rok Mihevc <ro...@mihevc.org>
---
 dev/merge_arrow_pr.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dev/merge_arrow_pr.py b/dev/merge_arrow_pr.py
index f6ecc7d1ff..490ee787e3 100755
--- a/dev/merge_arrow_pr.py
+++ b/dev/merge_arrow_pr.py
@@ -426,7 +426,9 @@ class PullRequest(object):
         commit_title = f'{self.title} (#{self.number})'
         commit_message_chunks = []
         if self.body is not None:
-            commit_message_chunks.append(self.body)
+            # avoid github user name references by inserting a space after @
+            body = re.sub(r"@(\w+)", "@ \\1", self.body)
+            commit_message_chunks.append(body)
 
         committer_name = run_cmd("git config --get user.name").strip()
         committer_email = run_cmd("git config --get user.email").strip()