Merge branch 'rs/commit-m-no-edit' into maint

* rs/commit-m-no-edit:
  commit: don't start editor if empty message is given with -m

diff --cc builtin/commit.c
Simple merge

diff --cc t/t7502-commit.sh
Simple merge