File tree 1 file changed +5
-4
lines changed
1 file changed +5
-4
lines changed Original file line number Diff line number Diff line change @@ -77,7 +77,8 @@ test_expect_success 'setup' '
77
77
test_path_is_missing sub/A &&
78
78
test_path_is_file a &&
79
79
test_path_is_file sub/B/b &&
80
- test_path_is_file sub2/a
80
+ test_path_is_file sub2/a &&
81
+ git branch -m main
81
82
'
82
83
83
84
# The two tests below check a special case: the sparsity patterns exclude '/b'
@@ -110,12 +111,12 @@ test_expect_success 'grep unmerged file despite not matching sparsity patterns'
110
111
b:modified-b-in-branchY
111
112
EOF
112
113
test_when_finished "test_might_fail git merge --abort && \
113
- git checkout master " &&
114
+ git checkout main " &&
114
115
115
116
git sparse-checkout disable &&
116
- git checkout -b branchY master &&
117
+ git checkout -b branchY main &&
117
118
test_commit modified-b-in-branchY b &&
118
- git checkout -b branchX master &&
119
+ git checkout -b branchX main &&
119
120
test_commit modified-b-in-branchX b &&
120
121
121
122
git sparse-checkout init &&
You can’t perform that action at this time.
0 commit comments