diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-11-18 13:32:51 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-11-18 13:32:51 -0800 |
commit | 2ad1f930d2b698e6dd485581fbf8879767657de7 (patch) | |
tree | e951ea7bf36babca7894f111fa3f936cac5717b3 /t/t5515/fetch.br-branches-one-octopus | |
parent | Merge branch 'dd/upload-pack-stateless-eof' (diff) | |
parent | t5515: use `main` as the name of the main branch for testing (conclusion) (diff) | |
download | tgif-2ad1f930d2b698e6dd485581fbf8879767657de7.tar.xz |
Merge branch 'js/default-branch-name-adjust-t5515'
Prepare a test script to transition of the default branch name to
'main'.
* js/default-branch-name-adjust-t5515:
t5515: use `main` as the name of the main branch for testing (conclusion)
t5515: use `main` as the name of the main branch for testing (part 3)
t5515: use `main` as the name of the main branch for testing (part 2)
t5515: use `main` as the name of the main branch for testing (part 1)
Diffstat (limited to 't/t5515/fetch.br-branches-one-octopus')
-rw-r--r-- | t/t5515/fetch.br-branches-one-octopus | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t5515/fetch.br-branches-one-octopus b/t/t5515/fetch.br-branches-one-octopus index 97c4b544b8..46af763fec 100644 --- a/t/t5515/fetch.br-branches-one-octopus +++ b/t/t5515/fetch.br-branches-one-octopus @@ -1,7 +1,7 @@ # br-branches-one-octopus 8e32a6d901327a23ef831511badce7bf3bf46689 branch 'one' of ../ 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 branch 'two' of ../ -6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../ +ecf3b3627b498bdcb735cc4343bf165f76964e9a not-for-merge tag 'tag-main' of ../ 8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../ 22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../ c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../ |