Skip to content

Commit 0b9154a

Browse files
committed
Updated master/main branches error info
1 parent b85df8f commit 0b9154a

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

repo2docker/contentproviders/git.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ def fetch(self, spec, output_dir, yield_output=False):
4545
self.log.error(
4646
f"Failed to check out ref {ref}", extra=dict(phase=R2dState.FAILED)
4747
)
48-
if ref == "main":
48+
if ref == "master" or ref == "main":
4949
msg = (
50-
"Failed to check out the 'main' branch. "
51-
"Maybe the default branch is not named 'main' "
50+
f"Failed to check out the '{ref}' branch. "
51+
f"Maybe the default branch is not named '{ref}' "
5252
"for this repository.\n\nTry not explicitly "
5353
"specifying `--ref`."
5454
)

tests/external/reproductions.repos.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
# Test that a full remote/ref works
1313
- name: Binder Examples - Requirements
1414
url: https://github.com/binder-examples/requirements
15-
ref: origin/master
15+
ref: origin/main
1616
verify: python -c 'import matplotlib'
1717
# Test that ref is added to branch if not present
1818
- name: Binder Examples - Requirements
1919
url: https://github.com/binder-examples/requirements
20-
ref: master
20+
ref: main
2121
verify: python -c 'import matplotlib'
2222
# Test that tags work + ref is added to tag if not present
2323
- name: Binder Examples - Requirements

0 commit comments

Comments
 (0)