ljadskljasdljk

justfile

@@ -1,25 +1,34 @@
 #!/usr/bin/env just --justfile
 
+# support custom local justfile recipies
+#set fallback # git worktrees
+#import? 'justfile.extra' # git branches / jujitsu
+
 # makes variables accesible as $1 $2 $@, useful for escaping variadics
 set positional-arguments := true
 
 export invokedir := invocation_directory()
 export epoch := `date +%s`
+
+# default interactive settings
 export GUM_FILTER_HEIGHT := "15"
 export FZF_DEFAULT_OPTS := "--height 15 --cycle --bind 'ctrl-a:toggle-all' " + env('FZF_DEFAULT_OPTS', "")
+
+# deal with concurrency
 export GIT := `command -v git-wait >/dev/null && echo "git-wait" || echo "git"`
 
-# will trigger a direnv reload when we enter $SHELL
+# trigger a direnv reload when entering $SHELL
 export DIRENV_WATCHES := ""
 
-# please no surprises for now
+# try and avoid surprises via local nixpkgs overrides
 export NIXPKGS_CONFIG := ""
-export NIX_PATH := `echo "${NIX_PATH_ORIG:-"${NIX_PATH:-}"}"`
+#export NIX_PATH := "" # in case 'nixpkgs-overlay' is set here
+export NIX_PATH := `echo "${NIX_PATH_ORIG:-"${NIX_PATH:-}"}"` # in case 'nixpkgs-overlay' is set here
 
 XARGS_NL := "-d'\\n' --no-run-if-empty"
 NIX_EVAL_OPTS := "--log-format raw --option warn-dirty false"
 
-# required programs: git nix nom gum fzf tee nix-update
+# required programs: git nix nom gum fzf tee nix-update jq fd xe sd
 
 @_default:
     cd "$invokedir"; just "$(gum filter $(just --summary --unsorted | tr ' ' '\n' | grep -vxE 'commit|fixup|list|build'))"
@@ -910,6 +919,22 @@ test-merge $rev=`cd "$invokedir"; just _a_commit` *branches:
     fi
     exit "$retval"
 
+[no-cd]
+test-merge-in-new-branch $upstream=`just _a_upstream_release_branch "Select upstream branch"`:
+    #!/usr/bin/env -S bash -euo pipefail
+    [[ -n "$upstream" ]] || ! echo >&2 "ERROR: No branch selected"
+    oldref="$(git branch --show-current ||:)"
+    [[ -n "$oldref" ]] || oldref="$(GIT rev-parse HEAD)"
+    [[ -n "$oldref" ]] || ! echo >&2 "ERROR: Unable to determine current ref"
+    echo >checkout-original-rev.sh "git checkout $oldref"
+    chmod +x checkout-original-rev.sh
+    remote=$(cut <<<"$upstream" -d'/' -f1)
+    branch=$(cut <<<"$upstream" -d'/' -f2)
+    set -x
+    git checkout -b test-merge-"$oldref"-into-"$remote"-"$branch"
+    git pull "$remote" "$branch" --rebase
+
+
 open-package-urls $package=`just _a_package`:
     #!/usr/bin/env -S bash -euo pipefail
     fpkg="$(jq -rn --arg x "$package" '$x | @uri')"