ljljdsaljdsalj

justfile

@@ -531,7 +531,12 @@ pr $number=`just _a_pr`:
         if [[ -n "$upstream_branch" ]]; then
             remote="$(cut <<<"$upstream_branch" -d'/' -f1)"
             branch="$(cut <<<"$upstream_branch" -d'/' -f2)"
-            (set -x; $GIT pull --rebase "$remote" "$branch" || $GIT rebase --abort) ||:
+            # TODO: gitignore ./checkout-upstream-branch.sh
+            printf "git checkout --autostash %q\n" "$(git rev-parse --abbrev-ref HEAD)" > 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
     fi
     $SHELL