diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-11-18 18:23:59 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-18 18:23:59 +0900 |
| commit | 137c1f2f51bceb8d1f1f457c52129be78c0ac86d (patch) | |
| tree | f7b2495f49cf286356b0afce753840bf3e6e46b3 /t | |
| parent | Merge branch 'sg/ref-filter-wo-repository' (diff) | |
| parent | rebase: validate -C<n> and --whitespace=<mode> parameters early (diff) | |
| download | tgif-137c1f2f51bceb8d1f1f457c52129be78c0ac86d.tar.xz | |
Merge branch 'js/rebase-am-options'
The way "git rebase" parses and forwards the command line options
meant for underlying "git am" has been revamped, which fixed for
options with parameters that were not passed correctly.
* js/rebase-am-options:
rebase: validate -C<n> and --whitespace=<mode> parameters early
rebase: really just passthru the `git am` options
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3406-rebase-message.sh | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/t/t3406-rebase-message.sh b/t/t3406-rebase-message.sh index 0392e36d23..2c79eed4fe 100755 --- a/t/t3406-rebase-message.sh +++ b/t/t3406-rebase-message.sh @@ -84,4 +84,11 @@ test_expect_success 'rebase --onto outputs the invalid ref' ' test_i18ngrep "invalid-ref" err ' +test_expect_success 'error out early upon -C<n> or --whitespace=<bad>' ' + test_must_fail git rebase -Cnot-a-number HEAD 2>err && + test_i18ngrep "numerical value" err && + test_must_fail git rebase --whitespace=bad HEAD 2>err && + test_i18ngrep "Invalid whitespace option" err +' + test_done |