From 8f04173e7fcd8e82f60bea0da0c54c30998b7da9 Mon Sep 17 00:00:00 2001
From: Edward Thomson <ethomson@edwardthomson.com>
Date: Tue, 14 Jan 2025 23:43:54 +0000
Subject: [PATCH 1/8] benchmarks: rename cache benchmarks

The default in the world is to have a disk cache; it's exceptional to
_not_. Flip our naming, so that the (exceptional) `nocache` tests are
called out explicitly.
---
 tests/benchmarks/{blame__git_cached => blame__git}         | 0
 tests/benchmarks/{blame__linux_cached => blame__linux}     | 0
 tests/benchmarks/{blame__simple_cached => blame__simple}   | 0
 tests/benchmarks/hash-object__text_100kb                   | 4 ++--
 tests/benchmarks/hash-object__text_10mb                    | 4 ++--
 tests/benchmarks/hash-object__text_1kb                     | 4 ++--
 tests/benchmarks/hash-object__text_cached_100kb            | 7 -------
 tests/benchmarks/hash-object__text_cached_10mb             | 7 -------
 tests/benchmarks/hash-object__text_cached_1kb              | 7 -------
 tests/benchmarks/hash-object__text_nocache_100kb           | 7 +++++++
 tests/benchmarks/hash-object__text_nocache_10mb            | 7 +++++++
 tests/benchmarks/hash-object__text_nocache_1kb             | 7 +++++++
 tests/benchmarks/hash-object__write_text_100kb             | 6 +++---
 tests/benchmarks/hash-object__write_text_10mb              | 4 ++--
 tests/benchmarks/hash-object__write_text_1kb               | 4 ++--
 ..._cached_100kb => hash-object__write_text_nocache_100kb} | 6 +++---
 ...xt_cached_10mb => hash-object__write_text_nocache_10mb} | 4 ++--
 ...text_cached_1kb => hash-object__write_text_nocache_1kb} | 4 ++--
 18 files changed, 41 insertions(+), 41 deletions(-)
 rename tests/benchmarks/{blame__git_cached => blame__git} (100%)
 rename tests/benchmarks/{blame__linux_cached => blame__linux} (100%)
 rename tests/benchmarks/{blame__simple_cached => blame__simple} (100%)
 delete mode 100755 tests/benchmarks/hash-object__text_cached_100kb
 delete mode 100755 tests/benchmarks/hash-object__text_cached_10mb
 delete mode 100755 tests/benchmarks/hash-object__text_cached_1kb
 create mode 100755 tests/benchmarks/hash-object__text_nocache_100kb
 create mode 100755 tests/benchmarks/hash-object__text_nocache_10mb
 create mode 100755 tests/benchmarks/hash-object__text_nocache_1kb
 rename tests/benchmarks/{hash-object__write_text_cached_100kb => hash-object__write_text_nocache_100kb} (52%)
 rename tests/benchmarks/{hash-object__write_text_cached_10mb => hash-object__write_text_nocache_10mb} (65%)
 rename tests/benchmarks/{hash-object__write_text_cached_1kb => hash-object__write_text_nocache_1kb} (66%)

diff --git a/tests/benchmarks/blame__git_cached b/tests/benchmarks/blame__git
similarity index 100%
rename from tests/benchmarks/blame__git_cached
rename to tests/benchmarks/blame__git
diff --git a/tests/benchmarks/blame__linux_cached b/tests/benchmarks/blame__linux
similarity index 100%
rename from tests/benchmarks/blame__linux_cached
rename to tests/benchmarks/blame__linux
diff --git a/tests/benchmarks/blame__simple_cached b/tests/benchmarks/blame__simple
similarity index 100%
rename from tests/benchmarks/blame__simple_cached
rename to tests/benchmarks/blame__simple
diff --git a/tests/benchmarks/hash-object__text_100kb b/tests/benchmarks/hash-object__text_100kb
index d77f224b996..7c2a84125ae 100755
--- a/tests/benchmarks/hash-object__text_100kb
+++ b/tests/benchmarks/hash-object__text_100kb
@@ -2,6 +2,6 @@
 
 . "$(dirname "$0")/benchmark_helpers.sh"
 
-gitbench --prepare "create_text_file text_100kb 102400 &&
-                    flush_disk_cache" \
+gitbench --prepare "create_text_file text_100kb 102400" \
+         --warmup 5 \
          hash-object "text_100kb"
diff --git a/tests/benchmarks/hash-object__text_10mb b/tests/benchmarks/hash-object__text_10mb
index 215afc6c3ab..311ddca4c27 100755
--- a/tests/benchmarks/hash-object__text_10mb
+++ b/tests/benchmarks/hash-object__text_10mb
@@ -2,6 +2,6 @@
 
 . "$(dirname "$0")/benchmark_helpers.sh"
 
-gitbench --prepare "create_text_file text_10mb 10485760 &&
-                    flush_disk_cache" \
+gitbench --prepare "create_text_file text_10mb 10485760" \
+         --warmup 5 \
          hash-object "text_10mb"
diff --git a/tests/benchmarks/hash-object__text_1kb b/tests/benchmarks/hash-object__text_1kb
index 1348b2fea66..44c06ead7a3 100755
--- a/tests/benchmarks/hash-object__text_1kb
+++ b/tests/benchmarks/hash-object__text_1kb
@@ -2,6 +2,6 @@
 
 . "$(dirname "$0")/benchmark_helpers.sh"
 
-gitbench --prepare "create_text_file text_1kb 1024 &&
-                    flush_disk_cache" \
+gitbench --prepare "create_text_file text_1kb 1024" \
+         --warmup 5 \
          hash-object "text_1kb"
diff --git a/tests/benchmarks/hash-object__text_cached_100kb b/tests/benchmarks/hash-object__text_cached_100kb
deleted file mode 100755
index 7c2a84125ae..00000000000
--- a/tests/benchmarks/hash-object__text_cached_100kb
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash -e
-
-. "$(dirname "$0")/benchmark_helpers.sh"
-
-gitbench --prepare "create_text_file text_100kb 102400" \
-         --warmup 5 \
-         hash-object "text_100kb"
diff --git a/tests/benchmarks/hash-object__text_cached_10mb b/tests/benchmarks/hash-object__text_cached_10mb
deleted file mode 100755
index 311ddca4c27..00000000000
--- a/tests/benchmarks/hash-object__text_cached_10mb
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash -e
-
-. "$(dirname "$0")/benchmark_helpers.sh"
-
-gitbench --prepare "create_text_file text_10mb 10485760" \
-         --warmup 5 \
-         hash-object "text_10mb"
diff --git a/tests/benchmarks/hash-object__text_cached_1kb b/tests/benchmarks/hash-object__text_cached_1kb
deleted file mode 100755
index 44c06ead7a3..00000000000
--- a/tests/benchmarks/hash-object__text_cached_1kb
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash -e
-
-. "$(dirname "$0")/benchmark_helpers.sh"
-
-gitbench --prepare "create_text_file text_1kb 1024" \
-         --warmup 5 \
-         hash-object "text_1kb"
diff --git a/tests/benchmarks/hash-object__text_nocache_100kb b/tests/benchmarks/hash-object__text_nocache_100kb
new file mode 100755
index 00000000000..d77f224b996
--- /dev/null
+++ b/tests/benchmarks/hash-object__text_nocache_100kb
@@ -0,0 +1,7 @@
+#!/bin/bash -e
+
+. "$(dirname "$0")/benchmark_helpers.sh"
+
+gitbench --prepare "create_text_file text_100kb 102400 &&
+                    flush_disk_cache" \
+         hash-object "text_100kb"
diff --git a/tests/benchmarks/hash-object__text_nocache_10mb b/tests/benchmarks/hash-object__text_nocache_10mb
new file mode 100755
index 00000000000..215afc6c3ab
--- /dev/null
+++ b/tests/benchmarks/hash-object__text_nocache_10mb
@@ -0,0 +1,7 @@
+#!/bin/bash -e
+
+. "$(dirname "$0")/benchmark_helpers.sh"
+
+gitbench --prepare "create_text_file text_10mb 10485760 &&
+                    flush_disk_cache" \
+         hash-object "text_10mb"
diff --git a/tests/benchmarks/hash-object__text_nocache_1kb b/tests/benchmarks/hash-object__text_nocache_1kb
new file mode 100755
index 00000000000..1348b2fea66
--- /dev/null
+++ b/tests/benchmarks/hash-object__text_nocache_1kb
@@ -0,0 +1,7 @@
+#!/bin/bash -e
+
+. "$(dirname "$0")/benchmark_helpers.sh"
+
+gitbench --prepare "create_text_file text_1kb 1024 &&
+                    flush_disk_cache" \
+         hash-object "text_1kb"
diff --git a/tests/benchmarks/hash-object__write_text_100kb b/tests/benchmarks/hash-object__write_text_100kb
index fb72c092745..6803eeeaef7 100755
--- a/tests/benchmarks/hash-object__write_text_100kb
+++ b/tests/benchmarks/hash-object__write_text_100kb
@@ -3,7 +3,7 @@
 . "$(dirname "$0")/benchmark_helpers.sh"
 
 gitbench --prepare "sandbox_repo empty_standard_repo &&
-                    create_text_file text_100kb 102400 &&
-                    flush_disk_cache" \
+                    create_text_file text_100kb 102400" \
+         --warmup 5 \
          --chdir "empty_standard_repo" \
-         hash-object -w "../text_100kb"
+         hash-object "../text_100kb"
diff --git a/tests/benchmarks/hash-object__write_text_10mb b/tests/benchmarks/hash-object__write_text_10mb
index 9da091986fd..4335cc86e41 100755
--- a/tests/benchmarks/hash-object__write_text_10mb
+++ b/tests/benchmarks/hash-object__write_text_10mb
@@ -3,7 +3,7 @@
 . "$(dirname "$0")/benchmark_helpers.sh"
 
 gitbench --prepare "sandbox_repo empty_standard_repo &&
-                    create_text_file text_10mb 10485760 &&
-                    flush_disk_cache" \
+                    create_text_file text_10mb 10485760" \
+         --warmup 5 \
          --chdir "empty_standard_repo" \
          hash-object "../text_10mb"
diff --git a/tests/benchmarks/hash-object__write_text_1kb b/tests/benchmarks/hash-object__write_text_1kb
index ca34393adc6..8a4c5c97b3f 100755
--- a/tests/benchmarks/hash-object__write_text_1kb
+++ b/tests/benchmarks/hash-object__write_text_1kb
@@ -3,7 +3,7 @@
 . "$(dirname "$0")/benchmark_helpers.sh"
 
 gitbench --prepare "sandbox_repo empty_standard_repo &&
-                    create_text_file text_1kb 1024 &&
-                    flush_disk_cache" \
+                    create_text_file text_1kb 1024" \
+         --warmup 5 \
          --chdir "empty_standard_repo" \
          hash-object "../text_1kb"
diff --git a/tests/benchmarks/hash-object__write_text_cached_100kb b/tests/benchmarks/hash-object__write_text_nocache_100kb
similarity index 52%
rename from tests/benchmarks/hash-object__write_text_cached_100kb
rename to tests/benchmarks/hash-object__write_text_nocache_100kb
index 6803eeeaef7..fb72c092745 100755
--- a/tests/benchmarks/hash-object__write_text_cached_100kb
+++ b/tests/benchmarks/hash-object__write_text_nocache_100kb
@@ -3,7 +3,7 @@
 . "$(dirname "$0")/benchmark_helpers.sh"
 
 gitbench --prepare "sandbox_repo empty_standard_repo &&
-                    create_text_file text_100kb 102400" \
-         --warmup 5 \
+                    create_text_file text_100kb 102400 &&
+                    flush_disk_cache" \
          --chdir "empty_standard_repo" \
-         hash-object "../text_100kb"
+         hash-object -w "../text_100kb"
diff --git a/tests/benchmarks/hash-object__write_text_cached_10mb b/tests/benchmarks/hash-object__write_text_nocache_10mb
similarity index 65%
rename from tests/benchmarks/hash-object__write_text_cached_10mb
rename to tests/benchmarks/hash-object__write_text_nocache_10mb
index 4335cc86e41..9da091986fd 100755
--- a/tests/benchmarks/hash-object__write_text_cached_10mb
+++ b/tests/benchmarks/hash-object__write_text_nocache_10mb
@@ -3,7 +3,7 @@
 . "$(dirname "$0")/benchmark_helpers.sh"
 
 gitbench --prepare "sandbox_repo empty_standard_repo &&
-                    create_text_file text_10mb 10485760" \
-         --warmup 5 \
+                    create_text_file text_10mb 10485760 &&
+                    flush_disk_cache" \
          --chdir "empty_standard_repo" \
          hash-object "../text_10mb"
diff --git a/tests/benchmarks/hash-object__write_text_cached_1kb b/tests/benchmarks/hash-object__write_text_nocache_1kb
similarity index 66%
rename from tests/benchmarks/hash-object__write_text_cached_1kb
rename to tests/benchmarks/hash-object__write_text_nocache_1kb
index 8a4c5c97b3f..ca34393adc6 100755
--- a/tests/benchmarks/hash-object__write_text_cached_1kb
+++ b/tests/benchmarks/hash-object__write_text_nocache_1kb
@@ -3,7 +3,7 @@
 . "$(dirname "$0")/benchmark_helpers.sh"
 
 gitbench --prepare "sandbox_repo empty_standard_repo &&
-                    create_text_file text_1kb 1024" \
-         --warmup 5 \
+                    create_text_file text_1kb 1024 &&
+                    flush_disk_cache" \
          --chdir "empty_standard_repo" \
          hash-object "../text_1kb"

From 1a514b32c5af227184c35c872d36978c749dbc32 Mon Sep 17 00:00:00 2001
From: Edward Thomson <ethomson@edwardthomson.com>
Date: Wed, 15 Jan 2025 00:02:14 +0000
Subject: [PATCH 2/8] benchmarks: introduce `--admin` flag for admin benchmarks

Some benchmarks require administrative privileges, namely the ones that
blow up the disk cache. Don't run them by default, to avoid obnoxious
sudo password prompts, etc. Users can specify `--admin` to run them.
---
 tests/benchmarks/benchmark.sh                 | 13 +++++++--
 tests/benchmarks/benchmark_helpers.sh         | 27 ++++++++++++++++---
 .../hash-object__text_nocache_100kb           |  2 ++
 .../benchmarks/hash-object__text_nocache_10mb |  2 ++
 .../benchmarks/hash-object__text_nocache_1kb  |  2 ++
 .../hash-object__write_text_nocache_100kb     |  2 ++
 .../hash-object__write_text_nocache_10mb      |  2 ++
 .../hash-object__write_text_nocache_1kb       |  2 ++
 8 files changed, 47 insertions(+), 5 deletions(-)

diff --git a/tests/benchmarks/benchmark.sh b/tests/benchmarks/benchmark.sh
index e82eaabfad1..80530929d1f 100755
--- a/tests/benchmarks/benchmark.sh
+++ b/tests/benchmarks/benchmark.sh
@@ -6,7 +6,7 @@ set -eo pipefail
 # parse the command line
 #
 
-usage() { echo "usage: $(basename "$0") [--cli <path>] [--name <cli-name>] [--baseline-cli <path>] [--suite <suite>] [--json <path>] [--flamegraph] [--zip <path>] [--verbose] [--debug]"; }
+usage() { echo "usage: $(basename "$0") [--cli <path>] [--name <cli-name>] [--baseline-cli <path>] [--suite <suite>] [--admin] [--json <path>] [--flamegraph] [--zip <path>] [--verbose] [--debug]"; }
 
 TEST_CLI="git"
 TEST_CLI_NAME=
@@ -16,6 +16,7 @@ JSON_RESULT=
 FLAMEGRAPH=
 ZIP_RESULT=
 OUTPUT_DIR=
+ADMIN=
 VERBOSE=
 DEBUG=
 NEXT=
@@ -58,6 +59,8 @@ for a in "$@"; do
 		NEXT="suite"
 	elif [[ "${a}" == "-s"* ]]; then
 		SUITE="${a/-s/}"
+	elif [ "${a}" == "--admin" ]; then
+		ADMIN=1
 	elif [ "${a}" = "-v" ] || [ "${a}" == "--verbose" ]; then
 		VERBOSE=1
 	elif [ "${a}" == "--debug" ]; then
@@ -223,6 +226,10 @@ for TEST_PATH in "${BENCHMARK_DIR}"/*; do
 		SHOW_OUTPUT="--show-output"
 	fi
 
+	if [ "${ADMIN}" = "1" ]; then
+		ALLOW_ADMIN="--admin"
+	fi
+
 	OUTPUT_FILE="${OUTPUT_DIR}/${TEST_FILE}.out"
 	ERROR_FILE="${OUTPUT_DIR}/${TEST_FILE}.err"
 	JSON_FILE="${OUTPUT_DIR}/${TEST_FILE}.json"
@@ -230,7 +237,7 @@ for TEST_PATH in "${BENCHMARK_DIR}"/*; do
 
 	FAILED=
 	{
-	  ${TEST_PATH} --cli "${TEST_CLI}" --baseline-cli "${BASELINE_CLI}" --json "${JSON_FILE}" ${SHOW_OUTPUT} >"${OUTPUT_FILE}" 2>"${ERROR_FILE}";
+	  ${TEST_PATH} --cli "${TEST_CLI}" --baseline-cli "${BASELINE_CLI}" --json "${JSON_FILE}" ${ALLOW_ADMIN} ${SHOW_OUTPUT} >"${OUTPUT_FILE}" 2>"${ERROR_FILE}";
 	  FAILED=$?
 	} || true
 
@@ -311,6 +318,8 @@ for TEST_PATH in "${BENCHMARK_DIR}"/*; do
 				ANY_FAILED=1
 			fi
 		fi
+	else
+		echo ""
 	fi
 done
 
diff --git a/tests/benchmarks/benchmark_helpers.sh b/tests/benchmarks/benchmark_helpers.sh
index e5babf9c819..cf0cd512129 100644
--- a/tests/benchmarks/benchmark_helpers.sh
+++ b/tests/benchmarks/benchmark_helpers.sh
@@ -7,11 +7,12 @@ set -eo pipefail
 # command-line parsing
 #
 
-usage() { echo "usage: $(basename "$0") [--cli <path>] [--baseline-cli <path>] [--output-style <style>] [--json <path>] [--profile] [--flamegraph <path>]"; }
+usage() { echo "usage: $(basename "$0") [--cli <path>] [--baseline-cli <path>] [--admin] [--output-style <style>] [--json <path>] [--show-output] [--output-style <style>] [--profile] [--flamegraph <path>]"; }
 
 NEXT=
 BASELINE_CLI=
 TEST_CLI="git"
+ADMIN=
 SHOW_OUTPUT=
 JSON=
 PROFILE=
@@ -69,6 +70,8 @@ for a in "$@"; do
                 JSON="${a/-j/}"
 	elif [ "${a}" = "-p" ] || [ "${a}" = "--profile" ]; then
 		PROFILE=1
+	elif [ "${a}" = "--admin" ]; then
+		ADMIN=1
 	elif [ "${a}" = "-F" ] || [ "${a}" = "--flamegraph" ]; then
 		NEXT="flamegraph"
 	elif [[ "${a}" == "-F"* ]]; then
@@ -335,6 +338,9 @@ parse_arguments() {
 	# this test should run `n` warmups
 	WARMUP=0
 
+	# this test requires administrative privileges
+	REQUIRES_ADMIN=0
+
 	if [ "$*" = "" ]; then
 		gitbench_usage 1>&2
 		exit 1
@@ -356,6 +362,8 @@ parse_arguments() {
 			NEXT="prepare"
 		elif [ "${a}" = "--chdir" ]; then
 			NEXT="chdir"
+		elif [ "${a}" = "--requires-admin" ]; then
+			REQUIRES_ADMIN=1
 		elif [[ "${a}" == "--" ]]; then
 			shift
 			break
@@ -379,6 +387,7 @@ parse_arguments() {
 	echo "PREPARE=\"${PREPARE}\""
 	echo "CHDIR=\"${CHDIR}\""
 	echo "WARMUP=\"${WARMUP}\""
+	echo "REQUIRES_ADMIN=\"${REQUIRES_ADMIN}\""
 
 	echo -n "GIT_ARGUMENTS=("
 
@@ -388,7 +397,7 @@ parse_arguments() {
 	echo " )"
 }
 
-gitbench_usage() { echo "usage: gitbench command..."; }
+gitbench_usage() { echo "usage: gitbench [--requires-admin] [--warmup <count>] [--prepare <command>] [--chdir <directory>] command..."; }
 
 exec_profiler() {
 	if [ "${BASELINE_CLI}" != "" ]; then
@@ -490,7 +499,8 @@ exec_hyperfine() {
 # invocation of hyperfine.
 #
 gitbench() {
-	eval $(parse_arguments "$@")
+	argument_data=$(parse_arguments "$@")
+	eval ${argument_data}
 
 	# sanity check
 
@@ -515,6 +525,17 @@ gitbench() {
 #	rm -rf "${SANDBOX_DIR:?}"
 }
 
+# helper script to ensure that --admin is specified
+needs_admin() {
+	if [ "${ADMIN}" != "1" ]; then
+		echo "$0: skipping administrator test" 1>&2
+		echo "" 1>&2
+		echo "This benchmark needs administrative (root) privileges. To run it," 1>&2
+		echo "specify '--admin' to the benchmark." 1>&2
+		exit 2
+	fi
+}
+
 # helper script to give useful error messages about configuration
 needs_repo() {
 	REPO="${1}"
diff --git a/tests/benchmarks/hash-object__text_nocache_100kb b/tests/benchmarks/hash-object__text_nocache_100kb
index d77f224b996..374936ae567 100755
--- a/tests/benchmarks/hash-object__text_nocache_100kb
+++ b/tests/benchmarks/hash-object__text_nocache_100kb
@@ -2,6 +2,8 @@
 
 . "$(dirname "$0")/benchmark_helpers.sh"
 
+needs_admin
+
 gitbench --prepare "create_text_file text_100kb 102400 &&
                     flush_disk_cache" \
          hash-object "text_100kb"
diff --git a/tests/benchmarks/hash-object__text_nocache_10mb b/tests/benchmarks/hash-object__text_nocache_10mb
index 215afc6c3ab..8678fd57df8 100755
--- a/tests/benchmarks/hash-object__text_nocache_10mb
+++ b/tests/benchmarks/hash-object__text_nocache_10mb
@@ -2,6 +2,8 @@
 
 . "$(dirname "$0")/benchmark_helpers.sh"
 
+needs_admin
+
 gitbench --prepare "create_text_file text_10mb 10485760 &&
                     flush_disk_cache" \
          hash-object "text_10mb"
diff --git a/tests/benchmarks/hash-object__text_nocache_1kb b/tests/benchmarks/hash-object__text_nocache_1kb
index 1348b2fea66..4e25ba9fd99 100755
--- a/tests/benchmarks/hash-object__text_nocache_1kb
+++ b/tests/benchmarks/hash-object__text_nocache_1kb
@@ -2,6 +2,8 @@
 
 . "$(dirname "$0")/benchmark_helpers.sh"
 
+needs_admin
+
 gitbench --prepare "create_text_file text_1kb 1024 &&
                     flush_disk_cache" \
          hash-object "text_1kb"
diff --git a/tests/benchmarks/hash-object__write_text_nocache_100kb b/tests/benchmarks/hash-object__write_text_nocache_100kb
index fb72c092745..b2f2d4c7e7d 100755
--- a/tests/benchmarks/hash-object__write_text_nocache_100kb
+++ b/tests/benchmarks/hash-object__write_text_nocache_100kb
@@ -2,6 +2,8 @@
 
 . "$(dirname "$0")/benchmark_helpers.sh"
 
+needs_admin
+
 gitbench --prepare "sandbox_repo empty_standard_repo &&
                     create_text_file text_100kb 102400 &&
                     flush_disk_cache" \
diff --git a/tests/benchmarks/hash-object__write_text_nocache_10mb b/tests/benchmarks/hash-object__write_text_nocache_10mb
index 9da091986fd..66c9d6d3112 100755
--- a/tests/benchmarks/hash-object__write_text_nocache_10mb
+++ b/tests/benchmarks/hash-object__write_text_nocache_10mb
@@ -2,6 +2,8 @@
 
 . "$(dirname "$0")/benchmark_helpers.sh"
 
+needs_admin
+
 gitbench --prepare "sandbox_repo empty_standard_repo &&
                     create_text_file text_10mb 10485760 &&
                     flush_disk_cache" \
diff --git a/tests/benchmarks/hash-object__write_text_nocache_1kb b/tests/benchmarks/hash-object__write_text_nocache_1kb
index ca34393adc6..c66fda5335a 100755
--- a/tests/benchmarks/hash-object__write_text_nocache_1kb
+++ b/tests/benchmarks/hash-object__write_text_nocache_1kb
@@ -2,6 +2,8 @@
 
 . "$(dirname "$0")/benchmark_helpers.sh"
 
+needs_admin
+
 gitbench --prepare "sandbox_repo empty_standard_repo &&
                     create_text_file text_1kb 1024 &&
                     flush_disk_cache" \

From 14d5a5e407d71549a3e71abf1b4fdcf88224b75d Mon Sep 17 00:00:00 2001
From: Edward Thomson <ethomson@edwardthomson.com>
Date: Wed, 15 Jan 2025 00:07:48 +0000
Subject: [PATCH 3/8] ci: run administrative benchmarks

---
 .github/workflows/benchmark.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
index a4658307c3c..103f4bcd07c 100644
--- a/.github/workflows/benchmark.yml
+++ b/.github/workflows/benchmark.yml
@@ -117,6 +117,7 @@ jobs:
         mkdir benchmark && cd benchmark
         ../source/tests/benchmarks/benchmark.sh \
             ${SUITE_FLAG} ${DEBUG_FLAG} \
+            --admin \
             --baseline-cli "git" --cli "${GIT2_CLI}" --name libgit2 \
             --json benchmarks.json --flamegraph --zip benchmarks.zip
       shell: bash

From f4cc6b9913195b291e7634f665eeeaaa61728c89 Mon Sep 17 00:00:00 2001
From: Edward Thomson <ethomson@edwardthomson.com>
Date: Wed, 15 Jan 2025 23:32:06 +0000
Subject: [PATCH 4/8] benchmarks: create top-level benchmarks folder

Benchmarks aren't tests; create a top-level `benchmarks` folder and move
`tests/benchmarks` to `benchmarks/cli`.
---
 .github/workflows/benchmark.yml                     |   2 +-
 {tests/benchmarks => benchmarks/cli}/README.md      |   0
 .../cli}/_script/flamegraph/README.md               |   0
 .../cli}/_script/flamegraph/aix-perf.pl             |   0
 .../cli}/_script/flamegraph/difffolded.pl           |   0
 .../_script/flamegraph/example-dtrace-stacks.txt    |   0
 .../cli}/_script/flamegraph/example-dtrace.svg      |   0
 .../_script/flamegraph/example-perf-stacks.txt.gz   | Bin
 .../cli}/_script/flamegraph/example-perf.svg        |   0
 .../cli}/_script/flamegraph/files.pl                |   0
 .../cli}/_script/flamegraph/flamegraph.pl           |   0
 .../cli}/_script/flamegraph/jmaps                   |   0
 .../cli}/_script/flamegraph/pkgsplit-perf.pl        |   0
 .../cli}/_script/flamegraph/range-perf.pl           |   0
 .../cli}/_script/flamegraph/record-test.sh          |   0
 .../cli}/_script/flamegraph/stackcollapse-aix.pl    |   0
 .../_script/flamegraph/stackcollapse-bpftrace.pl    |   0
 .../flamegraph/stackcollapse-chrome-tracing.py      |   0
 .../_script/flamegraph/stackcollapse-elfutils.pl    |   0
 .../flamegraph/stackcollapse-faulthandler.pl        |   0
 .../cli}/_script/flamegraph/stackcollapse-gdb.pl    |   0
 .../cli}/_script/flamegraph/stackcollapse-go.pl     |   0
 .../_script/flamegraph/stackcollapse-ibmjava.pl     |   0
 .../_script/flamegraph/stackcollapse-instruments.pl |   0
 .../flamegraph/stackcollapse-java-exceptions.pl     |   0
 .../cli}/_script/flamegraph/stackcollapse-jstack.pl |   0
 .../cli}/_script/flamegraph/stackcollapse-ljp.awk   |   0
 .../_script/flamegraph/stackcollapse-perf-sched.awk |   0
 .../cli}/_script/flamegraph/stackcollapse-perf.pl   |   0
 .../cli}/_script/flamegraph/stackcollapse-pmc.pl    |   0
 .../_script/flamegraph/stackcollapse-recursive.pl   |   0
 .../_script/flamegraph/stackcollapse-sample.awk     |   0
 .../cli}/_script/flamegraph/stackcollapse-stap.pl   |   0
 .../cli}/_script/flamegraph/stackcollapse-vsprof.pl |   0
 .../_script/flamegraph/stackcollapse-vtune-mc.pl    |   0
 .../cli}/_script/flamegraph/stackcollapse-vtune.pl  |   0
 .../cli}/_script/flamegraph/stackcollapse-wcp.pl    |   0
 .../_script/flamegraph/stackcollapse-xdebug.php     |   0
 .../cli}/_script/flamegraph/stackcollapse.pl        |   0
 .../cli}/_script/flamegraph/test.sh                 |   0
 {tests/benchmarks => benchmarks/cli}/benchmark.sh   |   0
 .../cli}/benchmark_helpers.sh                       |   2 +-
 {tests/benchmarks => benchmarks/cli}/blame__git     |   0
 {tests/benchmarks => benchmarks/cli}/blame__linux   |   0
 {tests/benchmarks => benchmarks/cli}/blame__simple  |   0
 .../cli}/hash-object__text_100kb                    |   0
 .../cli}/hash-object__text_10mb                     |   0
 .../cli}/hash-object__text_1kb                      |   0
 .../cli}/hash-object__text_nocache_100kb            |   0
 .../cli}/hash-object__text_nocache_10mb             |   0
 .../cli}/hash-object__text_nocache_1kb              |   0
 .../cli}/hash-object__write_text_100kb              |   0
 .../cli}/hash-object__write_text_10mb               |   0
 .../cli}/hash-object__write_text_1kb                |   0
 .../cli}/hash-object__write_text_nocache_100kb      |   0
 .../cli}/hash-object__write_text_nocache_10mb       |   0
 .../cli}/hash-object__write_text_nocache_1kb        |   0
 .../benchmarks => benchmarks/cli}/indexpack__250mb  |   0
 58 files changed, 2 insertions(+), 2 deletions(-)
 rename {tests/benchmarks => benchmarks/cli}/README.md (100%)
 rename {tests/benchmarks => benchmarks/cli}/_script/flamegraph/README.md (100%)
 rename {tests/benchmarks => benchmarks/cli}/_script/flamegraph/aix-perf.pl (100%)
 rename {tests/benchmarks => benchmarks/cli}/_script/flamegraph/difffolded.pl (100%)
 rename {tests/benchmarks => benchmarks/cli}/_script/flamegraph/example-dtrace-stacks.txt (100%)
 rename {tests/benchmarks => benchmarks/cli}/_script/flamegraph/example-dtrace.svg (100%)
 rename {tests/benchmarks => benchmarks/cli}/_script/flamegraph/example-perf-stacks.txt.gz (100%)
 rename {tests/benchmarks => benchmarks/cli}/_script/flamegraph/example-perf.svg (100%)
 rename {tests/benchmarks => benchmarks/cli}/_script/flamegraph/files.pl (100%)
 rename {tests/benchmarks => benchmarks/cli}/_script/flamegraph/flamegraph.pl (100%)
 rename {tests/benchmarks => benchmarks/cli}/_script/flamegraph/jmaps (100%)
 rename {tests/benchmarks => benchmarks/cli}/_script/flamegraph/pkgsplit-perf.pl (100%)
 rename {tests/benchmarks => benchmarks/cli}/_script/flamegraph/range-perf.pl (100%)
 rename {tests/benchmarks => benchmarks/cli}/_script/flamegraph/record-test.sh (100%)
 rename {tests/benchmarks => benchmarks/cli}/_script/flamegraph/stackcollapse-aix.pl (100%)
 rename {tests/benchmarks => benchmarks/cli}/_script/flamegraph/stackcollapse-bpftrace.pl (100%)
 rename {tests/benchmarks => benchmarks/cli}/_script/flamegraph/stackcollapse-chrome-tracing.py (100%)
 rename {tests/benchmarks => benchmarks/cli}/_script/flamegraph/stackcollapse-elfutils.pl (100%)
 rename {tests/benchmarks => benchmarks/cli}/_script/flamegraph/stackcollapse-faulthandler.pl (100%)
 rename {tests/benchmarks => benchmarks/cli}/_script/flamegraph/stackcollapse-gdb.pl (100%)
 rename {tests/benchmarks => benchmarks/cli}/_script/flamegraph/stackcollapse-go.pl (100%)
 rename {tests/benchmarks => benchmarks/cli}/_script/flamegraph/stackcollapse-ibmjava.pl (100%)
 rename {tests/benchmarks => benchmarks/cli}/_script/flamegraph/stackcollapse-instruments.pl (100%)
 rename {tests/benchmarks => benchmarks/cli}/_script/flamegraph/stackcollapse-java-exceptions.pl (100%)
 rename {tests/benchmarks => benchmarks/cli}/_script/flamegraph/stackcollapse-jstack.pl (100%)
 rename {tests/benchmarks => benchmarks/cli}/_script/flamegraph/stackcollapse-ljp.awk (100%)
 rename {tests/benchmarks => benchmarks/cli}/_script/flamegraph/stackcollapse-perf-sched.awk (100%)
 rename {tests/benchmarks => benchmarks/cli}/_script/flamegraph/stackcollapse-perf.pl (100%)
 rename {tests/benchmarks => benchmarks/cli}/_script/flamegraph/stackcollapse-pmc.pl (100%)
 rename {tests/benchmarks => benchmarks/cli}/_script/flamegraph/stackcollapse-recursive.pl (100%)
 rename {tests/benchmarks => benchmarks/cli}/_script/flamegraph/stackcollapse-sample.awk (100%)
 rename {tests/benchmarks => benchmarks/cli}/_script/flamegraph/stackcollapse-stap.pl (100%)
 rename {tests/benchmarks => benchmarks/cli}/_script/flamegraph/stackcollapse-vsprof.pl (100%)
 rename {tests/benchmarks => benchmarks/cli}/_script/flamegraph/stackcollapse-vtune-mc.pl (100%)
 rename {tests/benchmarks => benchmarks/cli}/_script/flamegraph/stackcollapse-vtune.pl (100%)
 rename {tests/benchmarks => benchmarks/cli}/_script/flamegraph/stackcollapse-wcp.pl (100%)
 rename {tests/benchmarks => benchmarks/cli}/_script/flamegraph/stackcollapse-xdebug.php (100%)
 rename {tests/benchmarks => benchmarks/cli}/_script/flamegraph/stackcollapse.pl (100%)
 rename {tests/benchmarks => benchmarks/cli}/_script/flamegraph/test.sh (100%)
 rename {tests/benchmarks => benchmarks/cli}/benchmark.sh (100%)
 rename {tests/benchmarks => benchmarks/cli}/benchmark_helpers.sh (99%)
 rename {tests/benchmarks => benchmarks/cli}/blame__git (100%)
 rename {tests/benchmarks => benchmarks/cli}/blame__linux (100%)
 rename {tests/benchmarks => benchmarks/cli}/blame__simple (100%)
 rename {tests/benchmarks => benchmarks/cli}/hash-object__text_100kb (100%)
 rename {tests/benchmarks => benchmarks/cli}/hash-object__text_10mb (100%)
 rename {tests/benchmarks => benchmarks/cli}/hash-object__text_1kb (100%)
 rename {tests/benchmarks => benchmarks/cli}/hash-object__text_nocache_100kb (100%)
 rename {tests/benchmarks => benchmarks/cli}/hash-object__text_nocache_10mb (100%)
 rename {tests/benchmarks => benchmarks/cli}/hash-object__text_nocache_1kb (100%)
 rename {tests/benchmarks => benchmarks/cli}/hash-object__write_text_100kb (100%)
 rename {tests/benchmarks => benchmarks/cli}/hash-object__write_text_10mb (100%)
 rename {tests/benchmarks => benchmarks/cli}/hash-object__write_text_1kb (100%)
 rename {tests/benchmarks => benchmarks/cli}/hash-object__write_text_nocache_100kb (100%)
 rename {tests/benchmarks => benchmarks/cli}/hash-object__write_text_nocache_10mb (100%)
 rename {tests/benchmarks => benchmarks/cli}/hash-object__write_text_nocache_1kb (100%)
 rename {tests/benchmarks => benchmarks/cli}/indexpack__250mb (100%)

diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
index 103f4bcd07c..1ff7178e9d8 100644
--- a/.github/workflows/benchmark.yml
+++ b/.github/workflows/benchmark.yml
@@ -115,7 +115,7 @@ jobs:
         fi
 
         mkdir benchmark && cd benchmark
-        ../source/tests/benchmarks/benchmark.sh \
+        ../source/benchmarks/cli/benchmark.sh \
             ${SUITE_FLAG} ${DEBUG_FLAG} \
             --admin \
             --baseline-cli "git" --cli "${GIT2_CLI}" --name libgit2 \
diff --git a/tests/benchmarks/README.md b/benchmarks/cli/README.md
similarity index 100%
rename from tests/benchmarks/README.md
rename to benchmarks/cli/README.md
diff --git a/tests/benchmarks/_script/flamegraph/README.md b/benchmarks/cli/_script/flamegraph/README.md
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/README.md
rename to benchmarks/cli/_script/flamegraph/README.md
diff --git a/tests/benchmarks/_script/flamegraph/aix-perf.pl b/benchmarks/cli/_script/flamegraph/aix-perf.pl
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/aix-perf.pl
rename to benchmarks/cli/_script/flamegraph/aix-perf.pl
diff --git a/tests/benchmarks/_script/flamegraph/difffolded.pl b/benchmarks/cli/_script/flamegraph/difffolded.pl
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/difffolded.pl
rename to benchmarks/cli/_script/flamegraph/difffolded.pl
diff --git a/tests/benchmarks/_script/flamegraph/example-dtrace-stacks.txt b/benchmarks/cli/_script/flamegraph/example-dtrace-stacks.txt
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/example-dtrace-stacks.txt
rename to benchmarks/cli/_script/flamegraph/example-dtrace-stacks.txt
diff --git a/tests/benchmarks/_script/flamegraph/example-dtrace.svg b/benchmarks/cli/_script/flamegraph/example-dtrace.svg
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/example-dtrace.svg
rename to benchmarks/cli/_script/flamegraph/example-dtrace.svg
diff --git a/tests/benchmarks/_script/flamegraph/example-perf-stacks.txt.gz b/benchmarks/cli/_script/flamegraph/example-perf-stacks.txt.gz
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/example-perf-stacks.txt.gz
rename to benchmarks/cli/_script/flamegraph/example-perf-stacks.txt.gz
diff --git a/tests/benchmarks/_script/flamegraph/example-perf.svg b/benchmarks/cli/_script/flamegraph/example-perf.svg
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/example-perf.svg
rename to benchmarks/cli/_script/flamegraph/example-perf.svg
diff --git a/tests/benchmarks/_script/flamegraph/files.pl b/benchmarks/cli/_script/flamegraph/files.pl
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/files.pl
rename to benchmarks/cli/_script/flamegraph/files.pl
diff --git a/tests/benchmarks/_script/flamegraph/flamegraph.pl b/benchmarks/cli/_script/flamegraph/flamegraph.pl
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/flamegraph.pl
rename to benchmarks/cli/_script/flamegraph/flamegraph.pl
diff --git a/tests/benchmarks/_script/flamegraph/jmaps b/benchmarks/cli/_script/flamegraph/jmaps
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/jmaps
rename to benchmarks/cli/_script/flamegraph/jmaps
diff --git a/tests/benchmarks/_script/flamegraph/pkgsplit-perf.pl b/benchmarks/cli/_script/flamegraph/pkgsplit-perf.pl
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/pkgsplit-perf.pl
rename to benchmarks/cli/_script/flamegraph/pkgsplit-perf.pl
diff --git a/tests/benchmarks/_script/flamegraph/range-perf.pl b/benchmarks/cli/_script/flamegraph/range-perf.pl
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/range-perf.pl
rename to benchmarks/cli/_script/flamegraph/range-perf.pl
diff --git a/tests/benchmarks/_script/flamegraph/record-test.sh b/benchmarks/cli/_script/flamegraph/record-test.sh
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/record-test.sh
rename to benchmarks/cli/_script/flamegraph/record-test.sh
diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-aix.pl b/benchmarks/cli/_script/flamegraph/stackcollapse-aix.pl
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/stackcollapse-aix.pl
rename to benchmarks/cli/_script/flamegraph/stackcollapse-aix.pl
diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-bpftrace.pl b/benchmarks/cli/_script/flamegraph/stackcollapse-bpftrace.pl
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/stackcollapse-bpftrace.pl
rename to benchmarks/cli/_script/flamegraph/stackcollapse-bpftrace.pl
diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-chrome-tracing.py b/benchmarks/cli/_script/flamegraph/stackcollapse-chrome-tracing.py
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/stackcollapse-chrome-tracing.py
rename to benchmarks/cli/_script/flamegraph/stackcollapse-chrome-tracing.py
diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-elfutils.pl b/benchmarks/cli/_script/flamegraph/stackcollapse-elfutils.pl
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/stackcollapse-elfutils.pl
rename to benchmarks/cli/_script/flamegraph/stackcollapse-elfutils.pl
diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-faulthandler.pl b/benchmarks/cli/_script/flamegraph/stackcollapse-faulthandler.pl
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/stackcollapse-faulthandler.pl
rename to benchmarks/cli/_script/flamegraph/stackcollapse-faulthandler.pl
diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-gdb.pl b/benchmarks/cli/_script/flamegraph/stackcollapse-gdb.pl
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/stackcollapse-gdb.pl
rename to benchmarks/cli/_script/flamegraph/stackcollapse-gdb.pl
diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-go.pl b/benchmarks/cli/_script/flamegraph/stackcollapse-go.pl
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/stackcollapse-go.pl
rename to benchmarks/cli/_script/flamegraph/stackcollapse-go.pl
diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-ibmjava.pl b/benchmarks/cli/_script/flamegraph/stackcollapse-ibmjava.pl
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/stackcollapse-ibmjava.pl
rename to benchmarks/cli/_script/flamegraph/stackcollapse-ibmjava.pl
diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-instruments.pl b/benchmarks/cli/_script/flamegraph/stackcollapse-instruments.pl
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/stackcollapse-instruments.pl
rename to benchmarks/cli/_script/flamegraph/stackcollapse-instruments.pl
diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-java-exceptions.pl b/benchmarks/cli/_script/flamegraph/stackcollapse-java-exceptions.pl
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/stackcollapse-java-exceptions.pl
rename to benchmarks/cli/_script/flamegraph/stackcollapse-java-exceptions.pl
diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-jstack.pl b/benchmarks/cli/_script/flamegraph/stackcollapse-jstack.pl
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/stackcollapse-jstack.pl
rename to benchmarks/cli/_script/flamegraph/stackcollapse-jstack.pl
diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-ljp.awk b/benchmarks/cli/_script/flamegraph/stackcollapse-ljp.awk
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/stackcollapse-ljp.awk
rename to benchmarks/cli/_script/flamegraph/stackcollapse-ljp.awk
diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-perf-sched.awk b/benchmarks/cli/_script/flamegraph/stackcollapse-perf-sched.awk
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/stackcollapse-perf-sched.awk
rename to benchmarks/cli/_script/flamegraph/stackcollapse-perf-sched.awk
diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-perf.pl b/benchmarks/cli/_script/flamegraph/stackcollapse-perf.pl
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/stackcollapse-perf.pl
rename to benchmarks/cli/_script/flamegraph/stackcollapse-perf.pl
diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-pmc.pl b/benchmarks/cli/_script/flamegraph/stackcollapse-pmc.pl
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/stackcollapse-pmc.pl
rename to benchmarks/cli/_script/flamegraph/stackcollapse-pmc.pl
diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-recursive.pl b/benchmarks/cli/_script/flamegraph/stackcollapse-recursive.pl
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/stackcollapse-recursive.pl
rename to benchmarks/cli/_script/flamegraph/stackcollapse-recursive.pl
diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-sample.awk b/benchmarks/cli/_script/flamegraph/stackcollapse-sample.awk
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/stackcollapse-sample.awk
rename to benchmarks/cli/_script/flamegraph/stackcollapse-sample.awk
diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-stap.pl b/benchmarks/cli/_script/flamegraph/stackcollapse-stap.pl
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/stackcollapse-stap.pl
rename to benchmarks/cli/_script/flamegraph/stackcollapse-stap.pl
diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-vsprof.pl b/benchmarks/cli/_script/flamegraph/stackcollapse-vsprof.pl
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/stackcollapse-vsprof.pl
rename to benchmarks/cli/_script/flamegraph/stackcollapse-vsprof.pl
diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-vtune-mc.pl b/benchmarks/cli/_script/flamegraph/stackcollapse-vtune-mc.pl
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/stackcollapse-vtune-mc.pl
rename to benchmarks/cli/_script/flamegraph/stackcollapse-vtune-mc.pl
diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-vtune.pl b/benchmarks/cli/_script/flamegraph/stackcollapse-vtune.pl
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/stackcollapse-vtune.pl
rename to benchmarks/cli/_script/flamegraph/stackcollapse-vtune.pl
diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-wcp.pl b/benchmarks/cli/_script/flamegraph/stackcollapse-wcp.pl
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/stackcollapse-wcp.pl
rename to benchmarks/cli/_script/flamegraph/stackcollapse-wcp.pl
diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-xdebug.php b/benchmarks/cli/_script/flamegraph/stackcollapse-xdebug.php
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/stackcollapse-xdebug.php
rename to benchmarks/cli/_script/flamegraph/stackcollapse-xdebug.php
diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse.pl b/benchmarks/cli/_script/flamegraph/stackcollapse.pl
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/stackcollapse.pl
rename to benchmarks/cli/_script/flamegraph/stackcollapse.pl
diff --git a/tests/benchmarks/_script/flamegraph/test.sh b/benchmarks/cli/_script/flamegraph/test.sh
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/test.sh
rename to benchmarks/cli/_script/flamegraph/test.sh
diff --git a/tests/benchmarks/benchmark.sh b/benchmarks/cli/benchmark.sh
similarity index 100%
rename from tests/benchmarks/benchmark.sh
rename to benchmarks/cli/benchmark.sh
diff --git a/tests/benchmarks/benchmark_helpers.sh b/benchmarks/cli/benchmark_helpers.sh
similarity index 99%
rename from tests/benchmarks/benchmark_helpers.sh
rename to benchmarks/cli/benchmark_helpers.sh
index cf0cd512129..f78aabc09f8 100644
--- a/tests/benchmarks/benchmark_helpers.sh
+++ b/benchmarks/cli/benchmark_helpers.sh
@@ -105,7 +105,7 @@ fullpath() {
 }
 
 resources_dir() {
-	cd "$(dirname "$0")/../resources" && pwd
+	cd "$(dirname "$0")/../../tests/resources" && pwd
 }
 
 temp_dir() {
diff --git a/tests/benchmarks/blame__git b/benchmarks/cli/blame__git
similarity index 100%
rename from tests/benchmarks/blame__git
rename to benchmarks/cli/blame__git
diff --git a/tests/benchmarks/blame__linux b/benchmarks/cli/blame__linux
similarity index 100%
rename from tests/benchmarks/blame__linux
rename to benchmarks/cli/blame__linux
diff --git a/tests/benchmarks/blame__simple b/benchmarks/cli/blame__simple
similarity index 100%
rename from tests/benchmarks/blame__simple
rename to benchmarks/cli/blame__simple
diff --git a/tests/benchmarks/hash-object__text_100kb b/benchmarks/cli/hash-object__text_100kb
similarity index 100%
rename from tests/benchmarks/hash-object__text_100kb
rename to benchmarks/cli/hash-object__text_100kb
diff --git a/tests/benchmarks/hash-object__text_10mb b/benchmarks/cli/hash-object__text_10mb
similarity index 100%
rename from tests/benchmarks/hash-object__text_10mb
rename to benchmarks/cli/hash-object__text_10mb
diff --git a/tests/benchmarks/hash-object__text_1kb b/benchmarks/cli/hash-object__text_1kb
similarity index 100%
rename from tests/benchmarks/hash-object__text_1kb
rename to benchmarks/cli/hash-object__text_1kb
diff --git a/tests/benchmarks/hash-object__text_nocache_100kb b/benchmarks/cli/hash-object__text_nocache_100kb
similarity index 100%
rename from tests/benchmarks/hash-object__text_nocache_100kb
rename to benchmarks/cli/hash-object__text_nocache_100kb
diff --git a/tests/benchmarks/hash-object__text_nocache_10mb b/benchmarks/cli/hash-object__text_nocache_10mb
similarity index 100%
rename from tests/benchmarks/hash-object__text_nocache_10mb
rename to benchmarks/cli/hash-object__text_nocache_10mb
diff --git a/tests/benchmarks/hash-object__text_nocache_1kb b/benchmarks/cli/hash-object__text_nocache_1kb
similarity index 100%
rename from tests/benchmarks/hash-object__text_nocache_1kb
rename to benchmarks/cli/hash-object__text_nocache_1kb
diff --git a/tests/benchmarks/hash-object__write_text_100kb b/benchmarks/cli/hash-object__write_text_100kb
similarity index 100%
rename from tests/benchmarks/hash-object__write_text_100kb
rename to benchmarks/cli/hash-object__write_text_100kb
diff --git a/tests/benchmarks/hash-object__write_text_10mb b/benchmarks/cli/hash-object__write_text_10mb
similarity index 100%
rename from tests/benchmarks/hash-object__write_text_10mb
rename to benchmarks/cli/hash-object__write_text_10mb
diff --git a/tests/benchmarks/hash-object__write_text_1kb b/benchmarks/cli/hash-object__write_text_1kb
similarity index 100%
rename from tests/benchmarks/hash-object__write_text_1kb
rename to benchmarks/cli/hash-object__write_text_1kb
diff --git a/tests/benchmarks/hash-object__write_text_nocache_100kb b/benchmarks/cli/hash-object__write_text_nocache_100kb
similarity index 100%
rename from tests/benchmarks/hash-object__write_text_nocache_100kb
rename to benchmarks/cli/hash-object__write_text_nocache_100kb
diff --git a/tests/benchmarks/hash-object__write_text_nocache_10mb b/benchmarks/cli/hash-object__write_text_nocache_10mb
similarity index 100%
rename from tests/benchmarks/hash-object__write_text_nocache_10mb
rename to benchmarks/cli/hash-object__write_text_nocache_10mb
diff --git a/tests/benchmarks/hash-object__write_text_nocache_1kb b/benchmarks/cli/hash-object__write_text_nocache_1kb
similarity index 100%
rename from tests/benchmarks/hash-object__write_text_nocache_1kb
rename to benchmarks/cli/hash-object__write_text_nocache_1kb
diff --git a/tests/benchmarks/indexpack__250mb b/benchmarks/cli/indexpack__250mb
similarity index 100%
rename from tests/benchmarks/indexpack__250mb
rename to benchmarks/cli/indexpack__250mb

From 02f084bb9e5fca304fd87c29476bfe4229b34ed4 Mon Sep 17 00:00:00 2001
From: Edward Thomson <ethomson@edwardthomson.com>
Date: Thu, 16 Jan 2025 08:47:17 +0000
Subject: [PATCH 5/8] benchmarks: the write_text benchmarks should actually
 write

The `hash-object__write_text...` benchmarks are intended to call
`hash-object -w`. They should actually do so.
---
 benchmarks/cli/hash-object__write_text_100kb        | 2 +-
 benchmarks/cli/hash-object__write_text_10mb         | 2 +-
 benchmarks/cli/hash-object__write_text_1kb          | 2 +-
 benchmarks/cli/hash-object__write_text_nocache_10mb | 2 +-
 benchmarks/cli/hash-object__write_text_nocache_1kb  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/benchmarks/cli/hash-object__write_text_100kb b/benchmarks/cli/hash-object__write_text_100kb
index 6803eeeaef7..84a8db73abd 100755
--- a/benchmarks/cli/hash-object__write_text_100kb
+++ b/benchmarks/cli/hash-object__write_text_100kb
@@ -6,4 +6,4 @@ gitbench --prepare "sandbox_repo empty_standard_repo &&
                     create_text_file text_100kb 102400" \
          --warmup 5 \
          --chdir "empty_standard_repo" \
-         hash-object "../text_100kb"
+         hash-object -w "../text_100kb"
diff --git a/benchmarks/cli/hash-object__write_text_10mb b/benchmarks/cli/hash-object__write_text_10mb
index 4335cc86e41..c494672e8d3 100755
--- a/benchmarks/cli/hash-object__write_text_10mb
+++ b/benchmarks/cli/hash-object__write_text_10mb
@@ -6,4 +6,4 @@ gitbench --prepare "sandbox_repo empty_standard_repo &&
                     create_text_file text_10mb 10485760" \
          --warmup 5 \
          --chdir "empty_standard_repo" \
-         hash-object "../text_10mb"
+         hash-object -w "../text_10mb"
diff --git a/benchmarks/cli/hash-object__write_text_1kb b/benchmarks/cli/hash-object__write_text_1kb
index 8a4c5c97b3f..8c9b085f2c9 100755
--- a/benchmarks/cli/hash-object__write_text_1kb
+++ b/benchmarks/cli/hash-object__write_text_1kb
@@ -6,4 +6,4 @@ gitbench --prepare "sandbox_repo empty_standard_repo &&
                     create_text_file text_1kb 1024" \
          --warmup 5 \
          --chdir "empty_standard_repo" \
-         hash-object "../text_1kb"
+         hash-object -w "../text_1kb"
diff --git a/benchmarks/cli/hash-object__write_text_nocache_10mb b/benchmarks/cli/hash-object__write_text_nocache_10mb
index 66c9d6d3112..42e47c0a85b 100755
--- a/benchmarks/cli/hash-object__write_text_nocache_10mb
+++ b/benchmarks/cli/hash-object__write_text_nocache_10mb
@@ -8,4 +8,4 @@ gitbench --prepare "sandbox_repo empty_standard_repo &&
                     create_text_file text_10mb 10485760 &&
                     flush_disk_cache" \
          --chdir "empty_standard_repo" \
-         hash-object "../text_10mb"
+         hash-object -w "../text_10mb"
diff --git a/benchmarks/cli/hash-object__write_text_nocache_1kb b/benchmarks/cli/hash-object__write_text_nocache_1kb
index c66fda5335a..229d5aee277 100755
--- a/benchmarks/cli/hash-object__write_text_nocache_1kb
+++ b/benchmarks/cli/hash-object__write_text_nocache_1kb
@@ -8,4 +8,4 @@ gitbench --prepare "sandbox_repo empty_standard_repo &&
                     create_text_file text_1kb 1024 &&
                     flush_disk_cache" \
          --chdir "empty_standard_repo" \
-         hash-object "../text_1kb"
+         hash-object -w "../text_1kb"

From 172e8ec1c3d67a4b6317eb1420ed7b4c2bdb919b Mon Sep 17 00:00:00 2001
From: Edward Thomson <ethomson@edwardthomson.com>
Date: Thu, 16 Jan 2025 08:59:57 +0000
Subject: [PATCH 6/8] benchmarks: add descriptions

Benchmark scripts now have optional descriptions that will be persisted
into the JSON output.
---
 benchmarks/cli/benchmark.sh                          | 4 +++-
 benchmarks/cli/blame__git                            | 2 ++
 benchmarks/cli/blame__linux                          | 2 ++
 benchmarks/cli/blame__simple                         | 2 ++
 benchmarks/cli/hash-object__text_100kb               | 2 ++
 benchmarks/cli/hash-object__text_10mb                | 2 ++
 benchmarks/cli/hash-object__text_1kb                 | 2 ++
 benchmarks/cli/hash-object__text_nocache_100kb       | 2 ++
 benchmarks/cli/hash-object__text_nocache_10mb        | 2 ++
 benchmarks/cli/hash-object__text_nocache_1kb         | 2 ++
 benchmarks/cli/hash-object__write_text_100kb         | 2 ++
 benchmarks/cli/hash-object__write_text_10mb          | 2 ++
 benchmarks/cli/hash-object__write_text_1kb           | 2 ++
 benchmarks/cli/hash-object__write_text_nocache_100kb | 2 ++
 benchmarks/cli/hash-object__write_text_nocache_10mb  | 2 ++
 benchmarks/cli/hash-object__write_text_nocache_1kb   | 2 ++
 benchmarks/cli/indexpack__250mb                      | 2 ++
 17 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/benchmarks/cli/benchmark.sh b/benchmarks/cli/benchmark.sh
index 80530929d1f..3acd444a4b0 100755
--- a/benchmarks/cli/benchmark.sh
+++ b/benchmarks/cli/benchmark.sh
@@ -212,6 +212,8 @@ for TEST_PATH in "${BENCHMARK_DIR}"/*; do
 		continue
 	fi
 
+	TEST_DESCRIPTION=$(( grep '^# Description: ' "${TEST_PATH}" || test $? = 1 ) | sed -e "s/^# Description: //")
+
 	ANY_FOUND=1
 	TEST_NAME="${TEST_FILE/__/::}"
 
@@ -279,7 +281,7 @@ for TEST_PATH in "${BENCHMARK_DIR}"/*; do
 	fi
 
 	# add our metadata to the hyperfine json result
-	jq ". |= { \"name\": \"${TEST_NAME}\" } + ." < "${JSON_FILE}" > "${JSON_FILE}.new" && mv "${JSON_FILE}.new" "${JSON_FILE}"
+	jq ". |= { \"name\": \"${TEST_NAME}\", \"description\": \"${TEST_DESCRIPTION}\" } + ." < "${JSON_FILE}" > "${JSON_FILE}.new" && mv "${JSON_FILE}.new" "${JSON_FILE}"
 
 	# run with flamegraph output if requested
 	if [ "${FLAMEGRAPH}" ]; then
diff --git a/benchmarks/cli/blame__git b/benchmarks/cli/blame__git
index 1664f737b90..a4c7700417a 100755
--- a/benchmarks/cli/blame__git
+++ b/benchmarks/cli/blame__git
@@ -1,4 +1,6 @@
 #!/bin/bash -e
+#
+# Description: blame a file in the core git repository
 
 . "$(dirname "$0")/benchmark_helpers.sh"
 
diff --git a/benchmarks/cli/blame__linux b/benchmarks/cli/blame__linux
index 20c5db5bbe5..a8078e3505f 100755
--- a/benchmarks/cli/blame__linux
+++ b/benchmarks/cli/blame__linux
@@ -1,4 +1,6 @@
 #!/bin/bash -e
+#
+# Description: blame a file in the linux repository
 
 . "$(dirname "$0")/benchmark_helpers.sh"
 
diff --git a/benchmarks/cli/blame__simple b/benchmarks/cli/blame__simple
index f13e2cb060f..c71c0d3519c 100755
--- a/benchmarks/cli/blame__simple
+++ b/benchmarks/cli/blame__simple
@@ -1,4 +1,6 @@
 #!/bin/bash -e
+#
+# Description: blame a simple file in the test repository
 
 . "$(dirname "$0")/benchmark_helpers.sh"
 
diff --git a/benchmarks/cli/hash-object__text_100kb b/benchmarks/cli/hash-object__text_100kb
index 7c2a84125ae..c60126631b2 100755
--- a/benchmarks/cli/hash-object__text_100kb
+++ b/benchmarks/cli/hash-object__text_100kb
@@ -1,4 +1,6 @@
 #!/bin/bash -e
+#
+# Description: hash a 100kb text file
 
 . "$(dirname "$0")/benchmark_helpers.sh"
 
diff --git a/benchmarks/cli/hash-object__text_10mb b/benchmarks/cli/hash-object__text_10mb
index 311ddca4c27..981db6452ad 100755
--- a/benchmarks/cli/hash-object__text_10mb
+++ b/benchmarks/cli/hash-object__text_10mb
@@ -1,4 +1,6 @@
 #!/bin/bash -e
+#
+# Description: hash a 10mb text file
 
 . "$(dirname "$0")/benchmark_helpers.sh"
 
diff --git a/benchmarks/cli/hash-object__text_1kb b/benchmarks/cli/hash-object__text_1kb
index 44c06ead7a3..a6d74d7f478 100755
--- a/benchmarks/cli/hash-object__text_1kb
+++ b/benchmarks/cli/hash-object__text_1kb
@@ -1,4 +1,6 @@
 #!/bin/bash -e
+#
+# Description: hash a 1kb text file
 
 . "$(dirname "$0")/benchmark_helpers.sh"
 
diff --git a/benchmarks/cli/hash-object__text_nocache_100kb b/benchmarks/cli/hash-object__text_nocache_100kb
index 374936ae567..83869b46142 100755
--- a/benchmarks/cli/hash-object__text_nocache_100kb
+++ b/benchmarks/cli/hash-object__text_nocache_100kb
@@ -1,4 +1,6 @@
 #!/bin/bash -e
+#
+# Description: hash a 100kb text file (after flushing disk cache)
 
 . "$(dirname "$0")/benchmark_helpers.sh"
 
diff --git a/benchmarks/cli/hash-object__text_nocache_10mb b/benchmarks/cli/hash-object__text_nocache_10mb
index 8678fd57df8..0919eefd3c7 100755
--- a/benchmarks/cli/hash-object__text_nocache_10mb
+++ b/benchmarks/cli/hash-object__text_nocache_10mb
@@ -1,4 +1,6 @@
 #!/bin/bash -e
+#
+# Description: hash a 10mb text file (after flushing disk cache)
 
 . "$(dirname "$0")/benchmark_helpers.sh"
 
diff --git a/benchmarks/cli/hash-object__text_nocache_1kb b/benchmarks/cli/hash-object__text_nocache_1kb
index 4e25ba9fd99..a7a5a54d764 100755
--- a/benchmarks/cli/hash-object__text_nocache_1kb
+++ b/benchmarks/cli/hash-object__text_nocache_1kb
@@ -1,4 +1,6 @@
 #!/bin/bash -e
+#
+# Description: hash a 1kb text file (after flushing disk cache)
 
 . "$(dirname "$0")/benchmark_helpers.sh"
 
diff --git a/benchmarks/cli/hash-object__write_text_100kb b/benchmarks/cli/hash-object__write_text_100kb
index 84a8db73abd..971e8897f26 100755
--- a/benchmarks/cli/hash-object__write_text_100kb
+++ b/benchmarks/cli/hash-object__write_text_100kb
@@ -1,4 +1,6 @@
 #!/bin/bash -e
+#
+# Description: write a 100kb text file to the object database
 
 . "$(dirname "$0")/benchmark_helpers.sh"
 
diff --git a/benchmarks/cli/hash-object__write_text_10mb b/benchmarks/cli/hash-object__write_text_10mb
index c494672e8d3..fe04d60175a 100755
--- a/benchmarks/cli/hash-object__write_text_10mb
+++ b/benchmarks/cli/hash-object__write_text_10mb
@@ -1,4 +1,6 @@
 #!/bin/bash -e
+#
+# Description: write a 10mb text file to the object database
 
 . "$(dirname "$0")/benchmark_helpers.sh"
 
diff --git a/benchmarks/cli/hash-object__write_text_1kb b/benchmarks/cli/hash-object__write_text_1kb
index 8c9b085f2c9..163e7f1650c 100755
--- a/benchmarks/cli/hash-object__write_text_1kb
+++ b/benchmarks/cli/hash-object__write_text_1kb
@@ -1,4 +1,6 @@
 #!/bin/bash -e
+#
+# Description: write a 1kb text file to the object database
 
 . "$(dirname "$0")/benchmark_helpers.sh"
 
diff --git a/benchmarks/cli/hash-object__write_text_nocache_100kb b/benchmarks/cli/hash-object__write_text_nocache_100kb
index b2f2d4c7e7d..a3e691c3fb2 100755
--- a/benchmarks/cli/hash-object__write_text_nocache_100kb
+++ b/benchmarks/cli/hash-object__write_text_nocache_100kb
@@ -1,4 +1,6 @@
 #!/bin/bash -e
+#
+# Description: write a 100kb text file to the ODB (after flushing disk cache)
 
 . "$(dirname "$0")/benchmark_helpers.sh"
 
diff --git a/benchmarks/cli/hash-object__write_text_nocache_10mb b/benchmarks/cli/hash-object__write_text_nocache_10mb
index 42e47c0a85b..83bd2dc037c 100755
--- a/benchmarks/cli/hash-object__write_text_nocache_10mb
+++ b/benchmarks/cli/hash-object__write_text_nocache_10mb
@@ -1,4 +1,6 @@
 #!/bin/bash -e
+#
+# Description: write a 10mb text file to the ODB (after flushing disk cache)
 
 . "$(dirname "$0")/benchmark_helpers.sh"
 
diff --git a/benchmarks/cli/hash-object__write_text_nocache_1kb b/benchmarks/cli/hash-object__write_text_nocache_1kb
index 229d5aee277..3bc3adcf129 100755
--- a/benchmarks/cli/hash-object__write_text_nocache_1kb
+++ b/benchmarks/cli/hash-object__write_text_nocache_1kb
@@ -1,4 +1,6 @@
 #!/bin/bash -e
+#
+# Description: write a 1kb text file to the ODB (after flushing disk cache)
 
 . "$(dirname "$0")/benchmark_helpers.sh"
 
diff --git a/benchmarks/cli/indexpack__250mb b/benchmarks/cli/indexpack__250mb
index 5bd964786ae..311b587f084 100755
--- a/benchmarks/cli/indexpack__250mb
+++ b/benchmarks/cli/indexpack__250mb
@@ -1,4 +1,6 @@
 #!/bin/bash -e
+#
+# Description: index a 250mb packfile
 
 . "$(dirname "$0")/benchmark_helpers.sh"
 

From 8d2dbf7c0748cedbe0710cdf04bcfdf6aed2ea76 Mon Sep 17 00:00:00 2001
From: Edward Thomson <ethomson@edwardthomson.com>
Date: Sat, 1 Mar 2025 12:56:23 +0000
Subject: [PATCH 7/8] test

---
 benchmarks/cli/benchmark.sh | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/benchmarks/cli/benchmark.sh b/benchmarks/cli/benchmark.sh
index 3acd444a4b0..da15c2e22e2 100755
--- a/benchmarks/cli/benchmark.sh
+++ b/benchmarks/cli/benchmark.sh
@@ -122,20 +122,10 @@ cli_version() {
 	fi
 }
 
-cli_commit() {
-	if [[ "$(uname -s)" == "MINGW"* ]]; then
-		BUILD_OPTIONS=$($(cygpath -u "$1") version --build-options)
-	else
-		BUILD_OPTIONS=$("$1" version --build-options)
-	fi
-
-	echo "${BUILD_OPTIONS}" | grep '^built from commit: ' | sed -e 's/^built from commit: //'
-}
-
 TEST_CLI_NAME=$(basename "${TEST_CLI}")
 TEST_CLI_PATH=$(fullpath "${TEST_CLI}")
 TEST_CLI_VERSION=$(cli_version "${TEST_CLI}")
-TEST_CLI_COMMIT=$(cli_commit "${TEST_CLI}")
+TEST_CLI_COMMIT="unknown"
 
 if [ "${BASELINE_CLI}" != "" ]; then
 	if [[ "${BASELINE_CLI}" == "/"* ]]; then
@@ -147,7 +137,7 @@ if [ "${BASELINE_CLI}" != "" ]; then
 	BASELINE_CLI_NAME=$(basename "${BASELINE_CLI}")
 	BASELINE_CLI_PATH=$(fullpath "${BASELINE_CLI}")
 	BASELINE_CLI_VERSION=$(cli_version "${BASELINE_CLI}")
-	BASELINE_CLI_COMMIT=$(cli_commit "${BASELINE_CLI}")
+	BASELINE_CLI_COMMIT="unknown"
 fi
 
 #

From 0379f86ddf0cc8b31f488e9e92189744b8eee431 Mon Sep 17 00:00:00 2001
From: Edward Thomson <ethomson@edwardthomson.com>
Date: Sat, 1 Mar 2025 13:03:36 +0000
Subject: [PATCH 8/8] Revert "test"

This reverts commit 8d2dbf7c0748cedbe0710cdf04bcfdf6aed2ea76.
---
 benchmarks/cli/benchmark.sh | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/benchmarks/cli/benchmark.sh b/benchmarks/cli/benchmark.sh
index da15c2e22e2..34728c6a283 100755
--- a/benchmarks/cli/benchmark.sh
+++ b/benchmarks/cli/benchmark.sh
@@ -122,10 +122,20 @@ cli_version() {
 	fi
 }
 
+cli_commit() {
+	if [[ "$(uname -s)" == "MINGW"* ]]; then
+		BUILD_OPTIONS=$($(cygpath -u "$1") version --build-options)
+	else
+		BUILD_OPTIONS=$("$1" version --build-options)
+	fi
+
+	echo "${BUILD_OPTIONS}" | { grep '^built from commit: ' || echo "unknown"; } | sed -e 's/^built from commit: //'
+}
+
 TEST_CLI_NAME=$(basename "${TEST_CLI}")
 TEST_CLI_PATH=$(fullpath "${TEST_CLI}")
 TEST_CLI_VERSION=$(cli_version "${TEST_CLI}")
-TEST_CLI_COMMIT="unknown"
+TEST_CLI_COMMIT=$(cli_commit "${TEST_CLI}")
 
 if [ "${BASELINE_CLI}" != "" ]; then
 	if [[ "${BASELINE_CLI}" == "/"* ]]; then
@@ -137,7 +147,7 @@ if [ "${BASELINE_CLI}" != "" ]; then
 	BASELINE_CLI_NAME=$(basename "${BASELINE_CLI}")
 	BASELINE_CLI_PATH=$(fullpath "${BASELINE_CLI}")
 	BASELINE_CLI_VERSION=$(cli_version "${BASELINE_CLI}")
-	BASELINE_CLI_COMMIT="unknown"
+	BASELINE_CLI_COMMIT=$(cli_commit "${BASELINE_CLI}")
 fi
 
 #
@@ -155,9 +165,9 @@ echo "##########################################################################
 echo ""
 
 if [ "${BASELINE_CLI}" != "" ]; then
-	echo "# Baseline CLI: ${BASELINE_CLI} (${BASELINE_CLI_VERSION})"
+	echo "# Baseline CLI: ${BASELINE_CLI} (${BASELINE_CLI_VERSION} ${BASELINE_CLI_COMMIT:0:7})"
 fi
-echo "# Test CLI: ${TEST_CLI} (${TEST_CLI_VERSION})"
+echo "# Test CLI: ${TEST_CLI} (${TEST_CLI_VERSION} ${TEST_CLI_COMMIT:0:7})"
 echo ""
 
 BENCHMARK_DIR=${BENCHMARK_DIR:=$(dirname "$0")}

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://rainy.clevelandohioweatherforecast.com/php-proxy/index.php?q=https://github.com/libgit2/libgit2/compare/main...ethomson/benchmarks.patch" target="_blank">Alternative Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/index.php?u=https://github.com/libgit2/libgit2/compare/main...ethomson/benchmarks.patch" target="_blank">pFad Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v3index.php?u=https://github.com/libgit2/libgit2/compare/main...ethomson/benchmarks.patch" target="_blank">pFad v3 Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v4index.php?u=https://github.com/libgit2/libgit2/compare/main...ethomson/benchmarks.patch" target="_blank">pFad v4 Proxy</a></p></body>
</html>