Merge branch 'jj-0.24.0-upgrade'

* Branch commit log: jj-fzf: depend on jj-0.24.0 testing.sh: add comments Signed-off-by: Tim Janik <[email protected]>
tim-janik · Dec 5, 2024 · b871daa · b871daa
2 parents 8ae827d + 363ef8b
commit b871daa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/jj-fzf b/jj-fzf
@@ -71,7 +71,7 @@ gawk --version | grep -Fq 'GNU Awk' || die "failed to find 'gawk' in \$PATH (GNU
 version0d() { gawk 'BEGIN{FPAT="[0-9]+"} {printf("%04d.%04d.%04d.%04d.%04d\n",$1,$2,$3,$4,$5);exit}' <<<" $* "; }
 versionge() { test "$(version0d "$2")a" '<' "$(version0d "$1")b"; }
 versionge "$(bash --version)" 5.1.16 || die "failed to find 'bash' version 5.1.16 in \$PATH"
-versionge "$(jj --version --ignore-working-copy)" 0.23 || die "failed to find 'jj' version 0.23.0 in \$PATH"
+versionge "$(jj --version --ignore-working-copy)" 0.24 || die "failed to find 'jj' version 0.24.0 in \$PATH"
 versionge "$(fzf --version)" 0.43 || die "failed to find 'fzf' version 0.43.0 in \$PATH" # 0.43.0 supports offset-up
 sed --version 2>/dev/null | grep -Fq 'GNU sed' && gsed() { sed "$@"; } && export -f gsed ||
     gsed --version | grep -Fq 'GNU sed' || die "failed to find 'gsed' in \$PATH (GNU sed)"

diff --git a/testing.sh b/testing.sh
@@ -107,3 +107,6 @@ clear_repo && mkcommits A B
   test "$WC" != "$NEW" ||
     die "failed to create new revision"
 ); TEST_OK "$TEST"
+
+# clear_repo && mkcommits A B 'A ->C' 'B|C ->D' && jj new >$DEVERR 2>&1
+# jj log --no-pager -r ..@