Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2020-11-19 02:44:35 +0300
committerJunio C Hamano <gitster@pobox.com>2020-11-20 02:44:18 +0300
commit95cf2c01875fd66421d3551e9e86db435523575d (patch)
tree93b27344f9fac7d11a5bd27b849a13cde5b246d9 /t/t5607-clone-bundle.sh
parent028cb644ec6450fa9438ba6b6d100c0f34e029a5 (diff)
t5[6-9]*: adjust the references to the default branch name "main"
This trick was performed via $ (cd t && sed -i -e 's/master/main/g' -e 's/MASTER/MAIN/g' \ -e 's/Master/Main/g' -- t5[6-9]*.sh) This allows us to define `GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main` for those tests. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5607-clone-bundle.sh')
-rwxr-xr-xt/t5607-clone-bundle.sh16
1 files changed, 8 insertions, 8 deletions
diff --git a/t/t5607-clone-bundle.sh b/t/t5607-clone-bundle.sh
index 6e2e4adbb4..5b39f4a288 100755
--- a/t/t5607-clone-bundle.sh
+++ b/t/t5607-clone-bundle.sh
@@ -1,7 +1,7 @@
#!/bin/sh
test_description='some bundle related tests'
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
. ./test-lib.sh
@@ -22,7 +22,7 @@ test_expect_success 'setup' '
'
test_expect_success '"verify" needs a worktree' '
- git bundle create tip.bundle -1 master &&
+ git bundle create tip.bundle -1 main &&
nongit test_must_fail git bundle verify ../tip.bundle 2>err &&
test_i18ngrep "need a repository" err
'
@@ -42,15 +42,15 @@ test_expect_success 'die if bundle file cannot be created' '
'
test_expect_failure 'bundle --stdin' '
- echo master | git bundle create stdin-bundle.bdl --stdin &&
+ echo main | git bundle create stdin-bundle.bdl --stdin &&
git ls-remote stdin-bundle.bdl >output &&
- grep master output
+ grep main output
'
test_expect_failure 'bundle --stdin <rev-list options>' '
- echo master | git bundle create hybrid-bundle.bdl --stdin tag &&
+ echo main | git bundle create hybrid-bundle.bdl --stdin tag &&
git ls-remote hybrid-bundle.bdl >output &&
- grep master output
+ grep main output
'
test_expect_success 'empty bundle file is rejected' '
@@ -86,14 +86,14 @@ test_expect_success 'prerequisites with an empty commit message' '
test_expect_success 'failed bundle creation does not leave cruft' '
# This fails because the bundle would be empty.
- test_must_fail git bundle create fail.bundle master..master &&
+ test_must_fail git bundle create fail.bundle main..main &&
test_path_is_missing fail.bundle.lock
'
test_expect_success 'fetch SHA-1 from bundle' '
test_create_repo foo &&
test_commit -C foo x &&
- git -C foo bundle create tip.bundle -1 master &&
+ git -C foo bundle create tip.bundle -1 main &&
git -C foo rev-parse HEAD >hash &&
# Exercise to ensure that fetching a SHA-1 from a bundle works with no