From: Phillip Wood <phillip.wood@dunelm.org.uk>
Date: Tue, 20 Mar 2018 11:10:56 +0000 (+0000)
Subject: rebase -p: error out if --signoff is given
X-Git-Tag: v2.18.0-rc0~130^2~1
X-Git-Url: http://git.bitbasher.net/?a=commitdiff_plain;h=b79966aa386fc58801e93496cd4e97d82acd53a5;p=git.git

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 <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-rebase.sh b/git-rebase.sh
index 5a5a65f3d2..e65b65acb4 100755
--- 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