| commit | 7e097e27d3a9a5a8517d8ed139dcfdb1a21fd87a | |
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Tue, 20 Nov 2018 20:02:01 +0000 (20 12:02 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 21 Nov 2018 04:40:46 +0000 (21 13:40 +0900) | ||
| tree | 58f4a3444232a3f82212cc09ff7ef0a1618b2ed5 | treesnapshot (tar.gz zip) |
| parent | 04519d72011478e17b2dbb177820ef2c886b8e5f | commitdiff |
legacy-rebase: backport -C<n> and --whitespace=<option> checks
Since 04519d720114 (rebase: validate -C<n> and --whitespace=<mode>
parameters early, 2018-11-14), the built-in rebase validates the -C and
--whitespace arguments early. As this commit also introduced a
regression test for this, and as a later commit introduced the
GIT_TEST_REBASE_USE_BUILTIN mode to run tests, we now have a
"regression" in the scripted version of `git rebase` on our hands.
Backport the validation to fix this.
Reported-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Since 04519d720114 (rebase: validate -C<n> and --whitespace=<mode>
parameters early, 2018-11-14), the built-in rebase validates the -C and
--whitespace arguments early. As this commit also introduced a
regression test for this, and as a later commit introduced the
GIT_TEST_REBASE_USE_BUILTIN mode to run tests, we now have a
"regression" in the scripted version of `git rebase` on our hands.
Backport the validation to fix this.
Reported-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-legacy-rebase.sh | diffblobblamehistory |