path: root/t/
diff options
authorJunio C Hamano <>2019-04-22 02:14:47 (GMT)
committerJunio C Hamano <>2019-04-22 02:14:47 (GMT)
commit39e4773daa758243ff3c708b024f39b7e47f0d7e (patch)
treeca326634792bed2f4085316f0fd31d1862cb0567 /t/
parent87e20f8c4ffe0c96b1c288057555aec81393da28 (diff)
parentb02e7d5d701a6217a3a522d9169b483b25c262dc (diff)
Merge branch 'js/spell-out-options-in-tests'
The tests have been updated not to rely on the abbreviated option names the parse-options API offers, to protect us from an abbreviated form of an option that used to be unique within the command getting non-unique when a new option that share the same prefix is added. * js/spell-out-options-in-tests: tests: disallow the use of abbreviated options (by default) tests (pack-objects): use the full, unabbreviated `--revs` option tests (status): spell out the `--find-renames` option in full tests (push): do not abbreviate the `--follow-tags` option t5531: avoid using an abbreviated option t7810: do not abbreviate `--no-exclude-standard` nor `--invert-match` tests (rebase): spell out the `--force-rebase` option tests (rebase): spell out the `--keep-empty` option
Diffstat (limited to 't/')
1 files changed, 2 insertions, 2 deletions
diff --git a/t/ b/t/
index 4bfbb79..49bf428 100755
--- a/t/
+++ b/t/
@@ -1382,7 +1382,7 @@ test_expect_success 'push does not follow tags by default' '
test_cmp expect actual
-test_expect_success 'push --follow-tag only pushes relevant tags' '
+test_expect_success 'push --follow-tags only pushes relevant tags' '
mk_test testrepo heads/master &&
rm -fr src dst &&
git init src &&
@@ -1396,7 +1396,7 @@ test_expect_success 'push --follow-tag only pushes relevant tags' '
git tag -m "future" future &&
git checkout master &&
git for-each-ref refs/heads/master refs/tags/tag >../expect &&
- git push --follow-tag ../dst master
+ git push --follow-tags ../dst master
) &&
cd dst &&