summaryrefslogtreecommitdiff
path: root/t/t7102-reset.sh
diff options
context:
space:
mode:
Diffstat (limited to 't/t7102-reset.sh')
-rwxr-xr-xt/t7102-reset.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t7102-reset.sh b/t/t7102-reset.sh
index 4af43d2..7d8fb18 100755
--- a/t/t7102-reset.sh
+++ b/t/t7102-reset.sh
@@ -7,7 +7,7 @@ test_description='git reset
Documented tests for git reset'
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
. ./test-lib.sh
@@ -148,7 +148,7 @@ test_expect_success 'trying to do reset --soft with pending merge should fail' '
printf "1st line 2nd file\n2nd line 2nd file\n3rd line" >secondfile &&
git commit -a -m "the change in branch2" &&
- git checkout master &&
+ git checkout main &&
git branch -D branch1 branch2 &&
check_changes $head5
'
@@ -170,7 +170,7 @@ test_expect_success 'trying to do reset --soft with pending checkout merge shoul
printf "1st line 2nd file\n2nd line 2nd file\n3rd line" >secondfile &&
git commit -a -m "the line in branch3" &&
- git checkout master &&
+ git checkout main &&
git branch -D branch3 branch4 &&
check_changes $head5
'
@@ -383,7 +383,7 @@ test_expect_success '--hard reset to ORIG_HEAD should clear a fast-forward merge
git reset --hard ORIG_HEAD &&
check_changes $head5 &&
- git checkout master &&
+ git checkout main &&
git branch -D branch1 branch2 &&
check_changes $head5
'