git command is broken in PR merge 500 error

[tyroneyeh]

Description

1. Create PR
2. Click Create merge commit button and in title add -, Example: - Test PR
3. Click Create merge commit button
4. Display 500 error

error log:
2023/02/21 10:04:47 ...rvices/pull/merge.go:544:rawMerge() [E] git commit [xx/xx:master_xx -> xx/xx:master]: git command is broken

Gitea Version

1.18.4

Can you reproduce the bug on the Gitea demo site?

Yes

Log Gist

No response

Screenshots

No response

Git Version

No response

Operating System

No response

How are you running Gitea?

command-line

Database

PostgreSQL

[wxiaoguang]

That's caused by

• Refactor git command arguments and make all arguments to be safe to be used #21535

#21535 is used to enhance the security of Gitea. In history, there were many RCE security reports, caused by user-provided -xxx inputs.

The side effect of #21535 is it's very strict, so if there are some leading dashes, it always rejects them.

To fix the problem fundemetally without affecting security:

• all {"commit", "-m", msg} should be rewritten to {"commit", "-m"+msg} or {"commit", "--message="+msg}

---

Workaround: remove the leading - from commit message.

[wxiaoguang]

The fix: Use --message=%s for git commit message #23028