diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-08-20 18:33:52 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-08-20 18:33:52 (GMT) |
commit | 42a6274b62397ab0047a21729c99f8fb06193f9b (patch) | |
tree | ab4cbf6e8f9cdd4d39bd75df627e8f440ca24a53 /t/t5510-fetch.sh | |
parent | 03e904cbd600afee7a39160aabc79a628916eecc (diff) | |
parent | b81699af4861f9363cdebb86e8f3d95bd0b794dc (diff) | |
download | git-42a6274b62397ab0047a21729c99f8fb06193f9b.zip git-42a6274b62397ab0047a21729c99f8fb06193f9b.tar.gz git-42a6274b62397ab0047a21729c99f8fb06193f9b.tar.bz2 |
Merge branch 'ab/fetch-tags-noclobber'
Test and doc clean-ups.
* ab/fetch-tags-noclobber:
pull doc: fix a long-standing grammar error
fetch tests: correct a comment "remove it" -> "remove them"
push tests: assert re-pushing annotated tags
push tests: add more testing for forced tag pushing
push tests: fix logic error in "push" test assertion
push tests: remove redundant 'git push' invocation
fetch tests: change "Tag" test tag to "testTag"
Diffstat (limited to 't/t5510-fetch.sh')
-rwxr-xr-x | t/t5510-fetch.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh index 5e810f4..3b7b305 100755 --- a/t/t5510-fetch.sh +++ b/t/t5510-fetch.sh @@ -648,7 +648,7 @@ test_configured_prune_type () { git rev-parse --verify refs/tags/newtag ) && - # now remove it + # now remove them git branch -d newbranch && git tag -d newtag && |