diff --git a/commands/pull_request.go b/commands/pull_request.go index f2edc9893666db09b93a870b236ed852e5ab071d..c67e7bf3ffdcbf086b1019f1e9e7e67740d86090 100644 --- a/commands/pull_request.go +++ b/commands/pull_request.go @@ -253,7 +253,7 @@ of text is the title and the rest is the description.`, fullBase, fullHead)) message, err = git.Show(commits[0]) utils.Check(err) - re := regexp.MustCompile(`(?m)\n^Signed-off-by:\s.*$`) + re := regexp.MustCompile(`\nSigned-off-by:\s.*$`) message = re.ReplaceAllString(message, "") } else if len(commits) > 1 { commitLogs, err = git.Log(baseTracking, headForMessage) diff --git a/features/pull_request.feature b/features/pull_request.feature index d1589a7ddfbb30a6abbd1718185e20d71667d84e..2c8362041076d203f6f01137d8d870ffc2aa06ab 100644 --- a/features/pull_request.feature +++ b/features/pull_request.feature @@ -81,14 +81,20 @@ Feature: hub pull-request post('/repos/mislav/coral/pulls') { halt 400 if request.content_charset != 'utf-8' assert :title => 'This is somewhat of a longish title that does not get wrapped & references #1234', - :body => nil + :body => 'Hello' status 201 json :html_url => "the://url" } """ Given I am on the "master" branch pushed to "origin/master" When I successfully run `git checkout --quiet -b topic` - Given I make a commit with message "This is somewhat of a longish title that does not get wrapped & references #1234" + Given I make a commit with message: + """ + This is somewhat of a longish title that does not get wrapped & references #1234 + + Hello + Signed-off-by: NAME + """ And the "topic" branch is pushed to "origin/topic" When I successfully run `hub pull-request` Then the output should contain exactly "the://url\n"