Skip to content

Commit 268eb57

Browse files
committed
SQUASH??? fixup
The test as posted breaks when run with $ make WITH_BREAKING_CHANGES=YesPlease test as the added part assumes that the default branch name is "master". This band-aid is sufficient for the purpose of the maintainer to get the CI passing, but the real solution should probably be done better in such a way that the latter step does not have to rely on the creation of "anchorpoint" in the previous step. I'll leave it to the contributor of the topic.
1 parent 1e33646 commit 268eb57

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

t/t5572-pull-submodule.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,8 @@ test_expect_success 'fetch submodule remote of different name from superproject'
246246
git -C child submodule update --init &&
247247
248248
# Needs to create unreachable commit from current master branch.
249-
git -C a-submodule checkout -b newmain HEAD^ &&
249+
git -C a-submodule tag anchorpoint HEAD &&
250+
git -C a-submodule checkout -b newmain anchorpoint^ &&
250251
test_commit -C a-submodule echo &&
251252
test_commit -C a-submodule moreecho &&
252253
subc=$(git -C a-submodule rev-parse --short HEAD) &&
@@ -265,7 +266,7 @@ test_expect_success 'fetch submodule remote of different non-origin name from su
265266
git -C child/a-submodule remote rename origin o2 &&
266267
267268
# Create commit that is unreachable from current master branch
268-
git -C a-submodule checkout -b newmain2 master^ &&
269+
git -C a-submodule checkout -b newmain2 anchorpoint^ &&
269270
test_commit -C a-submodule echo_o2 &&
270271
test_commit -C a-submodule moreecho_o2 &&
271272
subc=$(git -C a-submodule rev-parse --short HEAD) &&

0 commit comments

Comments
 (0)