@matheusbsbs / matheus-bagliano / commits / dd605e4956

tests (rebase): spell out the `--keep-empty` option

This test wants to run `git rebase` with the `--keep-empty` option, but it really only spelled out `--keep` and trusted Git's option parsing to determine that this was a unique abbreviation of the real option. However, Denton Liu contributed a patch series in https://public-inbox.org/git/cover.1553354374.git.liu.denton@gmail.com/ that introduces a new `git rebase` option called `--keep-base`, which makes this previously unique abbreviation non-unique. Whether this patch series is accepted or not, it is actually a bad practice to use abbreviated options in our test suite, because of the issue that those unique option names are not guaranteed to stay unique in the future. So let's just not use abbreviated options in the test suite. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Johannes Schindelin committed Mar 25, 2019 at 11:14 UTC dd605e4956903da2e375afe2e58beab2af39b7b8

1 file changed +2 -2

t/t5407-post-rewrite-hook.sh

+2 -2

@@ -131,7 +131,7 @@ test_expect_success 'git rebase -m --skip' '

131 test_expect_success 'git rebase with implicit use of interactive backend' '

132 git reset --hard D &&

133 clear_hook_input &&

134 - test_must_fail git rebase --keep --onto A B &&

134 + test_must_fail git rebase --keep-empty --onto A B &&

135 echo C > foo &&

136 git add foo &&

137 git rebase --continue &&

@@ -146,7 +146,7 @@ test_expect_success 'git rebase with implicit use of interactive backend' '

146 test_expect_success 'git rebase --skip with implicit use of interactive backend' '

147 git reset --hard D &&

148 clear_hook_input &&

149 - test_must_fail git rebase --keep --onto A B &&

149 + test_must_fail git rebase --keep-empty --onto A B &&

150 test_must_fail git rebase --skip &&

151 echo D > foo &&

152 git add foo &&