#3749 Sign-off the merge commits when the project enforces it
Merged 5 years ago by pingou. Opened 5 years ago by pingou.

file modified
+25 -2
@@ -1598,11 +1598,24 @@ 

                      author = _make_signature(

                          commitname, user_obj.default_email

                      )

+ 

+                     commit_message = "Merge #%s `%s`" % (

+                         request.id,

+                         request.title,

+                     )

+                     if request.project.settings.get(

+                         "Enforce_signed-off_commits_in_pull-request", False

+                     ):

+                         commit_message += "\n\nSigned-off-by %s <%s>" % (

git commit -s generates the line as Signed-off-by: ... with a colon (at least in version 2.17.1)

You are correct and this should be fixed, thanks!

+                             commitname,

+                             user_obj.default_email,

+                         )

+ 

                      commit = new_repo.create_commit(

                          "refs/heads/%s" % request.branch,

                          author,

                          author,

-                         "Merge #%s `%s`" % (request.id, request.title),

+                         commit_message,

                          tree,

                          [head.hex, repo_commit.oid.hex],

                      )
@@ -1652,11 +1665,21 @@ 

                  user_obj = pagure.lib.get_user(session, username)

                  commitname = user_obj.fullname or user_obj.user

                  author = _make_signature(commitname, user_obj.default_email)

+ 

+                 commit_message = "Merge #%s `%s`" % (request.id, request.title)

+                 if request.project.settings.get(

+                     "Enforce_signed-off_commits_in_pull-request", False

+                 ):

+                     commit_message += "\n\nSigned-off-by %s <%s>" % (

+                         commitname,

+                         user_obj.default_email,

+                     )

+ 

                  commit = new_repo.create_commit(

                      "refs/heads/%s" % request.branch,

                      author,

                      author,

-                     "Merge #%s `%s`" % (request.id, request.title),

+                     commit_message,

                      tree,

                      [head.hex, repo_commit.oid.hex],

                  )

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

rebased onto 4cc3439

5 years ago

rebased onto 389ca920601996164dca94332446109971a740fe

5 years ago

rebased onto f043008bc1db23f94fadcdd081dca3767a669a21

5 years ago

1 new commit added

  • Fix style by running black
5 years ago

rebased onto e8d81d774e38c38534a47213a069f63189536d85

5 years ago

rebased onto 7078738

5 years ago

Pull-Request has been merged by pingou

5 years ago

git commit -s generates the line as Signed-off-by: ... with a colon (at least in version 2.17.1)

You are correct and this should be fixed, thanks!