rebase -p: error out if --signoff is given

rebase --preserve-merges does not support --signoff so error out
rather than just silently ignoring it so that the user knows the
commits will not be signed off.

Signed-off-by: Phillip Wood <redacted>
Signed-off-by: Junio C Hamano <redacted>

diff --git a/git-rebase.sh b/git-rebase.sh
index 5a5a65f3d20d9d2fa5912b2ee1cf65e4d1e02c29..e65b65acb424c4923a317992ef300323c6b20d48 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -472,6 +472,8 @@ fi
 
 if test -n "$signoff"
 then
+       test -n "$preserve_merges" &&
+               die "$(gettext "error: cannot combine '--signoff' with '--preserve-merges'")"
        git_am_opt="$git_am_opt $signoff"
        force_rebase=t
 fi