From 87d7c82ada2c240ca5283c38e550e6eb5430b120 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sun, 15 Jun 2025 06:03:59 +0200
Subject: [PATCH] Revert "ljljljadslj"

This reverts commit b6a2607bbb3cb3252dcc8f4f920fb41318e46bbb.
---
 justfile | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/justfile b/justfile
index 16e3743..9a1d9bd 100644
--- a/justfile
+++ b/justfile
@@ -712,19 +712,8 @@ pr $number=`just _a_pr`:
         )
         cd prs/pr-"$number"
         (set -x; gh pr checkout "$number")
-        git branch -D just-nixpkgs-pr-"$number"-tmp
-        # TODO: set remote tracking branch with a git or http link to the contributors fork, if not already in `git remotes`
-        if [[ -n "$upstream_branch" ]]; then
-            remote="$(cut <<<"$upstream_branch" -d'/' -f1)"
-            branch="$(cut <<<"$upstream_branch" -d'/' -f2)"
-            # TODO: gitignore ./checkout-upstream-branch.sh
-            printf "#!/usr/bin/env -S bash -euo pipefail\ngit checkout --autostash %q\n" "$(git rev-parse --abbrev-ref HEAD)" > checkout-upstream-branch.sh
-            chmod +x checkout-upstream-branch.sh
-            (set -x;
-                $GIT checkout -b pr-"$number"-rebased-"$remote"-"$branch" ||:
-                $GIT pull --rebase "$remote" "$branch" || $GIT rebase --abort
-            ) || echo >&2 "retcode: $?" ||:
-        fi
+        # git branch -D just-nixpkgs-pr-"$number"-tmp
+        [[ -z "$upstream_branch" ]] || do_rebase "$upstream_branch"
     fi
     exec just _enter_interactive_shell