diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-11-21 20:39:01 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-21 20:39:01 +0900 |
| commit | fde566f222bd473193d9b39b44973a013f8b48b2 (patch) | |
| tree | fe39398205f5d6ceaee1f3e8d1c551b0a0044ecd | |
| parent | c17f086ecad796b4179aa1b0209f00d4f8ffdc0f (diff) | |
| parent | 7e097e27d3a9a5a8517d8ed139dcfdb1a21fd87a (diff) | |
| download | git-fde566f222bd473193d9b39b44973a013f8b48b2.tar.gz | |
Merge branch 'js/rebase-am-options-fix'
Recently, built-in "rebase" tightened the error checking for a few
options that are passed to underlying "am", but we forgot to make
the matching change to the scripted version, which has been
corrected.
* js/rebase-am-options-fix:
legacy-rebase: backport -C<n> and --whitespace=<option> checks
| -rwxr-xr-x | git-legacy-rebase.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/git-legacy-rebase.sh b/git-legacy-rebase.sh index 75a08b2683..b97ffdc9dd 100755 --- a/git-legacy-rebase.sh +++ b/git-legacy-rebase.sh @@ -337,6 +337,11 @@ do fix|strip) force_rebase=t ;; + warn|nowarn|error|error-all) + ;; # okay, known whitespace option + *) + die "fatal: Invalid whitespace option: '${1#*=}'" + ;; esac ;; --ignore-whitespace) @@ -352,6 +357,9 @@ do git_am_opt="$git_am_opt $1" force_rebase=t ;; + -C*[!0-9]*) + die "fatal: switch \`C' expects a numerical value" + ;; -C*) git_am_opt="$git_am_opt $1" ;; |