From 7b455f3921b3ebf72c955ddc133aeaf378426041 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 4 Nov 2025 12:51:01 +0100 Subject: [PATCH] jasdjkladsljk --- justfile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/justfile b/justfile index eca78dd..9cc41ad 100644 --- a/justfile +++ b/justfile @@ -947,7 +947,7 @@ setup: verbose $GIT remote add upstream "https://github.com/NixOS/nixpkgs.git" fi # TODO: check the mtime on the HEAD file instead? - if [[ $(( "$epoch" - "$($GIT log --oneline --format="%ct" HEAD -n1)" )) -gt $(( 60*60*24 )) ]]; then + if [[ $(( "$epoch" - "$(verbose $GIT log --oneline --format="%ct" HEAD -n1)" )) -gt $(( 60*60*24 )) ]]; then verbose $GIT pull --rebase --autostash upstream master >&2 fi add_upstream() ( @@ -971,14 +971,17 @@ setup: # remove eol upstreams declare -a branches=() + declare -a deleted=() readarray -td $'\n' branches < <( just _list_eol_upstream_release_branches "" "" ) for branch in "${branches[@]}"; do if [[ -e ../upstream/"$branch"/.git ]]; then verbose rm -rf ../upstream/"$branch" + deleted+=("$branch") fi done - - verbose $GIT worktree prune + if [[ "${#deleted[@]}" -gt 0 ]]; then + verbose $GIT worktree prune + fi clean: #!/usr/bin/env -S bash -euo pipefail