Skip to content

Commit

Permalink
Remove mentions to master
Browse files Browse the repository at this point in the history
  • Loading branch information
anapaulagomes committed Jul 25, 2023
1 parent df7bd96 commit 18b626e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ Let's say you have the following output from `git status`:

$ git status

On branch master
Your branch is ahead of 'origin/master' by 1 commit.
On branch main
Your branch is ahead of 'origin/main' by 1 commit.
(use "git push" to publish your local commits)

Untracked files:
Expand Down Expand Up @@ -65,7 +65,7 @@ pytest --picked --mode=branch

pytest --picked --mode=unstaged # default

pytest --picked --mode=branch --parent-branch=main # if your parent branch differs from "master"
pytest --picked --mode=branch --parent-branch=dev # if your parent branch differs from "main"
```

## Features
Expand Down
5 changes: 1 addition & 4 deletions tests/test_modes.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@ def git_repository(testdir):
assert testdir.run(*git_user).ret == 0
assert testdir.run(*git_email).ret == 0

testdir.run(
"git", "checkout", "-b", "master"
).ret # TODO remove when making main the default branch
assert testdir.run("git", "commit", "--allow-empty", "-m_").ret == 0
yield gitroot

Expand Down Expand Up @@ -100,7 +97,7 @@ def test_should_return_command_that_list_all_changed_files(self):
"diff",
"--name-status",
"--relative",
"master",
"main",
]

def test_should_return_command_that_list_all_changed_files_for_different_branch(
Expand Down

0 comments on commit 18b626e

Please sign in to comment.