From: Christian Marangi Date: Mon, 29 Apr 2024 21:26:11 +0000 (+0200) Subject: github-merge-pr: remove newline on removing SoB from committer X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=727eb6a24b9794fc035c4a4fef9396a2428a2a1a;p=maintainer-tools.git github-merge-pr: remove newline on removing SoB from committer Remove newline on removing SoB from committer if necessary to keep commit description tags tidy. Fixes: c1f80d0258a7 ("github-merge-pr: add Link: tag and Committer SoB") Signed-off-by: Christian Marangi --- diff --git a/github-merge-pr.sh b/github-merge-pr.sh index 64cd6bf..16a661d 100755 --- a/github-merge-pr.sh +++ b/github-merge-pr.sh @@ -137,7 +137,7 @@ if [ "$(echo "$PR_INFO" | jq -r ".maintainer_can_modify")" == "true" ]; then # Remove any previous SoB tag if the Pull Request Author and Committer match if ! $GIT filter-repo --message-callback " - return message.replace(b\"Signed-off-by: $(git config user.name) <$(git config user.email)>\",b\"\") + return message.replace(b\"Signed-off-by: $(git config user.name) <$(git config user.email)>\n\",b\"\") " --refs $BRANCH..$LOCAL_PR_BRANCH --force; then echo "Failed to remove previous Committer SoB tag" >&2 exit 9