[PATCH v2 2/3] rebase -p: error out if --signoff is given
- From
- Phillip Wood <phillip.wood@talktalk.net>
- Date
- Mar 20, 2018, 11:10 UTC
- Message-ID
- <20180320111057.23862-3-phillip.wood@talktalk.net>
- In-Reply-To
- <20180320111057.23862-1-phillip.wood@talktalk.net>
From: Phillip Wood <phillip.wood@dunelm.org.uk>
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> --- git-rebase.sh | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/git-rebase.sh b/git-rebase.sh index 5d854657a7..7d3bb9d443 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -479,6 +479,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
-- 2.16.2