Fix merge and remote settings being incorrect

.gitignore

@@ -0,0 +1 @@
+*.pyc

git_pr_helper/actions/action_add.py

@@ -123,7 +123,9 @@ def run(console: rich.console.Console, args: argparse.Namespace):
             remote = f"git@github.com:{remote}.git"
 
     name = f"pr/{pr_number}"
-    git("switch", "-c", name, "--track", f"{pr_remote}/{name}")
+    git("switch", "-c", name, head_hash)
+    git("config", "--null", f"branch.{name}.remote", pr_remote)
+    git("config", "--null", f"branch.{name}.merge", f"refs/pull/{pr_number}/head")
     write_pr_branch_info(name, PrBranchInfo(remote, branch, []))
 
     if args.prune:

git_pr_helper/actions/action_list.py

@@ -64,15 +64,15 @@ def run(console: rich.console.Console, args: argparse.Namespace):
     )
     for item in items:
         head, commit_full, commit, local, remote = item.split(" ")
+        pr_branch_info = pr_branch_infos.get(local)
+        if not pr_branch_info:
+            continue
         ahead, _, behind = git(
             "rev-list",
             "--left-right",
             "--count",
             f"{commit_full}...{remote}",
         )[0].partition("\t")
-        pr_branch_info = pr_branch_infos.get(local)
-        if not pr_branch_info:
-            continue
         branches[local] = BranchInfo(
             head == "1",
             commit,
@@ -100,8 +100,8 @@ def run(console: rich.console.Console, args: argparse.Namespace):
     table.add_column("branch", style=styles.ACCENT)
     table.add_column("note", style="bright_white")
 
-    # TODO(Grub4K): take this from the config actually
-    default_remote = "upstream"
+    # TODO(Grub4K): allow specifying this manually
+    default_remote = "origin"
 
     for branch in branches.values():
         local = rich.text.Text(branch.local)

git_pr_helper/actions/action_push.py

@@ -23,24 +23,34 @@ def configure_parser(parser: argparse.ArgumentParser):
     parser.add_argument(dest="remaining", nargs=argparse.REMAINDER)
 
 
+def parse_ref_line(line: str):
+    head_ref, _, current_remote_ref = line.partition(" ")
+    current_branch = head_ref.removeprefix("refs/heads/")
+    current_remote, _, remote_ref = current_remote_ref.removeprefix(
+        "refs/remotes/"
+    ).partition("/")
+    remote_ref = remote_ref.partition("/")[2]
+
+    return current_branch, current_remote, remote_ref
+
+
 def run(console: rich.console.Console, args: argparse.Namespace):
+    config = dict(read_pr_branch_infos())
     current_hash = git("rev-list", "-n", "1", "HEAD")[0]
-    head_ref, _, current_remote_ref = git(
+    lines = git(
         "for-each-ref",
         "--format=%(refname) %(upstream)",
         "--points-at",
         current_hash,
         "refs/heads/**",
-    )[0].partition(" ")
-    current_branch = head_ref.removeprefix("refs/heads/")
-    current_remote, _, remote_ref = (
-        current_remote_ref.partition("/")[2].partition("/")[2].partition("/")
     )
-    remote_ref = remote_ref.partition("/")[2]
 
-    config = dict(read_pr_branch_infos())
-    pr_branch_info = config.get(current_branch)
-    if not pr_branch_info:
+    for line in lines:
+        current_branch, current_remote, remote_ref = parse_ref_line(line)
+        pr_branch_info = config.get(current_branch)
+        if pr_branch_info:
+            break
+    else:
         console.print(
             rich.text.Text.assemble(
                 ("error", styles.ERROR),
@@ -51,7 +61,6 @@ def run(console: rich.console.Console, args: argparse.Namespace):
 
     # TODO(Grub4K): lazy if already up to date
     git("push", *args.remaining, pr_branch_info.remote, f"HEAD:{pr_branch_info.branch}")
-
     ref_spec = f"refs/pull/{remote_ref}/head:pr/{remote_ref}"
-    git("fetch", "--all", "--update-head-ok", current_remote, ref_spec)
+    git("fetch", "--update-head-ok", current_remote, ref_spec)
     return 0