summaryrefslogtreecommitdiff
path: root/t/t5515/refs.br-unconfig_branches-one
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-11-18 13:32:51 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-11-18 13:32:51 -0800
commit2ad1f930d2b698e6dd485581fbf8879767657de7 (patch)
treee951ea7bf36babca7894f111fa3f936cac5717b3 /t/t5515/refs.br-unconfig_branches-one
parentMerge branch 'dd/upload-pack-stateless-eof' (diff)
parentt5515: use `main` as the name of the main branch for testing (conclusion) (diff)
downloadtgif-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/refs.br-unconfig_branches-one')
-rw-r--r--t/t5515/refs.br-unconfig_branches-one4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t5515/refs.br-unconfig_branches-one b/t/t5515/refs.br-unconfig_branches-one
index 8a705a5df2..e8f79bf4b1 100644
--- a/t/t5515/refs.br-unconfig_branches-one
+++ b/t/t5515/refs.br-unconfig_branches-one
@@ -1,10 +1,10 @@
8e32a6d901327a23ef831511badce7bf3bf46689 refs/heads/branches-one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three