Merge branch 'tb/test-apfs-utf8-normalization'

diff --git a/git-rebase--merge.sh b/git-rebase--merge.sh
index 685f48ca49bcdac63f5577ac20daa2993be5e4a2..cf4c0422148935906ad939c5351652a1531e5f0d 100644 (file)
--- a/git-rebase--merge.sh
+++ b/git-rebase--merge.sh
@@ -27,7 +27,7 @@ continue_merge () {
        cmt=$(cat "$state_dir/current")
        if ! git diff-index --quiet --ignore-submodules HEAD --
        then
-               if ! git commit ${gpg_sign_opt:+"$gpg_sign_opt"} $allow_empty_message \
+               if ! git commit ${gpg_sign_opt:+"$gpg_sign_opt"} $signoff $allow_empty_message \
                        --no-verify -C "$cmt"
                then
                        echo "Commit failed, please do not call \"git commit\""