Skip to content

Commit

Permalink
fixups
Browse files Browse the repository at this point in the history
  • Loading branch information
blink1073 committed Feb 12, 2022
1 parent e476a10 commit 98d6ae4
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions jupyter_releaser/lib.py
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,7 @@ def prep_git(ref, branch, repo, auth, username, url):
ref = ref or ""

# Make sure we have *all* tags
util.run(f"{util.GIT_FETCH_CMD} --tags --force ")
util.run(f"{util.GIT_FETCH_CMD} --tags --force")

# Handle the ref
if ref.startswith("refs/pull/"):
Expand Down Expand Up @@ -597,7 +597,7 @@ def forwardport_changelog(

# switch to main branch here
branch = branch or util.get_default_branch()
util.run(f" {branch}")
util.run(f"{util.GIT_FETCH_CMD} {branch}")
util.run(f"git checkout {branch}")

# Bail if the tag has been merged to the branch
Expand Down
2 changes: 1 addition & 1 deletion jupyter_releaser/tests/test_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ def test_prep_git_full(py_package, tmp_path, mocker, runner):
call("git remote add origin https://snuffy:[email protected]/baz/bar.git"),
call(f"{GIT_FETCH_CMD} --tags --force"),
call(f"{GIT_FETCH_CMD} +refs/pull/42:refs/pull/42"),
call(" refs/pull/42"),
call(f"{GIT_FETCH_CMD} refs/pull/42"),
call("git checkout -B foo refs/pull/42"),
]
)
Expand Down

0 comments on commit 98d6ae4

Please sign in to comment.