Merge pull request #257 from blink1073/improve-git-clone

Author: blink1073

jupyter_releaser/lib.py

@@ -153,7 +153,7 @@ def make_changelog_pr(auth, branch, repo, title, commit_message, body, dry_run=F
         dirty = util.run("git --no-pager diff --stat") != ""
         if dirty:
             util.run("git stash")
-        util.run(f"git fetch origin {branch}")
+        util.run(f"{util.GIT_FETCH_CMD} {branch}")
         util.run(f"git checkout -b {pr_branch} origin/{branch}")
         if dirty:
             util.run("git stash apply")
@@ -532,7 +532,7 @@ def prep_git(ref, branch, repo, auth, username, url):
     ref = ref or ""
 
     # Make sure we have *all* tags
-    util.run("git fetch origin --tags --force --quiet")
+    util.run(f"{util.GIT_FETCH_CMD} --tags --force")
 
     # Handle the ref
     if ref.startswith("refs/pull/"):
@@ -543,11 +543,11 @@ def prep_git(ref, branch, repo, auth, username, url):
 
     # Reuse existing branch if possible
     if ref:
-        util.run(f"git fetch origin +{ref}:{ref_alias}")
-        util.run(f"git fetch origin {ref}")
+        util.run(f"{util.GIT_FETCH_CMD} +{ref}:{ref_alias}")
+        util.run(f"{util.GIT_FETCH_CMD} {ref}")
         checkout_cmd = f"git checkout -B {branch} {ref_alias}"
     else:
-        util.run(f"git fetch origin {branch}")
+        util.run(f"{util.GIT_FETCH_CMD} {branch}")
         checkout_cmd = f"git checkout {branch}"
 
     if checkout_exists:
@@ -599,7 +599,7 @@ def forwardport_changelog(
 
     # switch to main branch here
     branch = branch or util.get_default_branch()
-    util.run(f"git fetch origin {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

jupyter_releaser/tests/test_cli.py

@@ -24,6 +24,7 @@
 from jupyter_releaser.tests.util import REPO_DATA
 from jupyter_releaser.tests.util import VERSION_SPEC
 from jupyter_releaser.util import bump_version
+from jupyter_releaser.util import GIT_FETCH_CMD
 from jupyter_releaser.util import normalize_path
 from jupyter_releaser.util import run
 
@@ -107,9 +108,9 @@ def test_prep_git_full(py_package, tmp_path, mocker, runner):
             call('git config --global user.name "GitHub Action"'),
             call("git init .jupyter_releaser_checkout"),
             call("git remote add origin https://snuffy:[email protected]/baz/bar.git"),
-            call("git fetch origin --tags --force --quiet"),
-            call("git fetch origin +refs/pull/42:refs/pull/42"),
-            call("git fetch origin refs/pull/42"),
+            call(f"{GIT_FETCH_CMD} --tags --force"),
+            call(f"{GIT_FETCH_CMD} +refs/pull/42:refs/pull/42"),
+            call(f"{GIT_FETCH_CMD} refs/pull/42"),
             call("git checkout -B foo refs/pull/42"),
         ]
     )

jupyter_releaser/util.py

@@ -45,6 +45,8 @@
 SCHEMA = files("jupyter_releaser").joinpath("schema.json").read_text()
 SCHEMA = json.loads(SCHEMA)
 
+GIT_FETCH_CMD = "git fetch origin --filter=blob:none --quiet"
+
 
 def run(cmd, **kwargs):
     """Run a command as a subprocess and get the output as a string"""