revert changes to make changelog pr

Author: blink1073

jupyter_releaser/lib.py

@@ -163,19 +163,15 @@ def make_changelog_pr(auth, branch, repo, title, commit_message, body, dry_run=F
 
     # Make a new branch with a uuid suffix
     pr_branch = f"changelog-{uuid.uuid1().hex}"
-    util.run(f"{util.GIT_FETCH_CMD} {branch}", echo=True)
-    dirty = False
-    try:
-        util.run("git stash", echo=True)
-        dirty = True
-    except Exception:
-        pass
-    util.run(f"git checkout -b {pr_branch} origin/{branch}", echo=True)
-    if dirty:
-        if dry_run:
-            util.run("git merge --squash --strategy-option=theirs stash", echo=True)
-        else:
-            util.run("git stash apply", echo=True)
+
+    if not dry_run:
+        dirty = util.run("git --no-pager diff --stat") != ""
+        if dirty:
+            util.run("git stash")
+        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")
 
     # Add a commit with the message
     try:
@@ -192,8 +188,8 @@ def make_changelog_pr(auth, branch, repo, title, commit_message, body, dry_run=F
     head = pr_branch
     maintainer_can_modify = True
 
-    remote_name = util.get_remote_name(dry_run)
-    util.run(f"git push {remote_name} {pr_branch}", echo=True)
+    if not dry_run:
+        util.run(f"git push origin {pr_branch}", echo=True)
 
     #  title, head, base, body, maintainer_can_modify, draft, issue
     pull = gh.pulls.create(title, head, base, body, maintainer_can_modify, False, None)