From: Eslam reda ragheb via GitGitGadget Date: Thu, 26 Feb 2026 21:14:45 GMT Subject: [PATCH v4 08/10] t1901: extend structure metric coverage and portability Message-ID: <0525ed4cd99f312b35cd7c005f16679c682352c0.1772140487.git.gitgitgadget@gmail.com> In-Reply-To: From: Eslam reda ragheb Expand t1901 to cover additional structure metrics emitted by git repo structure, including maxima and aggregate keyvalue/nul checks. The test now validates both human-oriented table content and machine-readable fields for the extended metric set. Also make expectations more portable across hash algorithms and platforms by avoiding brittle assumptions. This includes wc output quirks on BSD/macOS and hash-format- sensitive expectations. Signed-off-by: Eslam reda ragheb --- t/t1901-repo-structure.sh | 250 ++++++++++++++++++++++++++++---------- 1 file changed, 187 insertions(+), 63 deletions(-) diff --git a/t/t1901-repo-structure.sh b/t/t1901-repo-structure.sh index 17ff164b05..7b7c4117aa 100755 --- a/t/t1901-repo-structure.sh +++ b/t/t1901-repo-structure.sh @@ -21,42 +21,174 @@ object_type_disk_usage() { fi } +object_type_max_inflated_size() { + max=0 + + for oid in $(git rev-list --all --objects \ + --filter=object:type=$1 --filter-provided-objects | cut -d" " -f1) + do + size=$(git cat-file -s "$oid") || return 1 + test "$size" -gt "$max" && max=$size + done + + echo "$max" +} + +tag_max_chain_depth() { + max=0 + + for oid in $(git rev-list --all --objects \ + --filter=object:type=tag --filter-provided-objects | cut -d" " -f1) + do + depth=0 + current=$oid + + while : + do + target=$(git cat-file -p "$current" | sed -n "s/^object //p" | sed -n 1p) || return 1 + test -n "$target" || break + depth=$((depth + 1)) + type=$(git cat-file -t "$target") || return 1 + test "$type" = tag || break + current=$target + done + + test "$depth" -gt "$max" && max=$depth + done + + echo "$max" +} + +object_max_inflated_size() { + max=0 + + for type in commit tree blob tag + do + type_max=$(object_type_max_inflated_size "$type") || return 1 + test "$type_max" -gt "$max" && max=$type_max + done + + echo "$max" +} + +object_type_max_disk_size() { + max=0 + + for oid in $(git rev-list --all --objects \ + --filter=object:type=$1 --filter-provided-objects | cut -d" " -f1) + do + size=$(echo "$oid" | git cat-file --batch-check='%(objectsize:disk)') || return 1 + test "$size" -gt "$max" && max=$size + done + + echo "$max" +} + +reference_count_total() { + git for-each-ref --format='%(refname)' | sed -n '$=' +} + +object_type_count() { + git rev-list --all --objects \ + --filter=object:type=$1 --filter-provided-objects | sed -n '$=' +} + +object_count_total() { + commits=$(object_type_count commit) || return 1 + trees=$(object_type_count tree) || return 1 + blobs=$(object_type_count blob) || return 1 + tags=$(object_type_count tag) || return 1 + + echo $((commits + trees + blobs + tags)) +} + +object_type_total_inflated_size() { + total=0 + + for oid in $(git rev-list --all --objects \ + --filter=object:type=$1 --filter-provided-objects | cut -d" " -f1) + do + size=$(git cat-file -s "$oid") || return 1 + total=$((total + size)) + done + + echo "$total" +} + +object_total_inflated_size() { + commits=$(object_type_total_inflated_size commit) || return 1 + trees=$(object_type_total_inflated_size tree) || return 1 + blobs=$(object_type_total_inflated_size blob) || return 1 + tags=$(object_type_total_inflated_size tag) || return 1 + + echo $((commits + trees + blobs + tags)) +} + +object_max_disk_size() { + max=0 + + for type in commit tree blob tag + do + type_max=$(object_type_max_disk_size "$type") || return 1 + test "$type_max" -gt "$max" && max=$type_max + done + + echo "$max" +} + +commit_max_parent_count() { + git rev-list --all --parents | awk ' + { n = NF - 1; if (n > max) max = n } + END { print max + 0 } + ' +} + +tree_max_entry_count() { + max=0 + + for oid in $(git rev-list --all --objects \ + --filter=object:type=tree --filter-provided-objects | cut -d" " -f1) + do + entries=$(git cat-file -p "$oid" | wc -l) || return 1 + test $entries -gt $max && max=$entries + done + + echo $max +} + +blob_max_path_length() { + git rev-list --all --objects \ + --filter=object:type=blob --filter-provided-objects | awk ' + NF > 1 { + len = length($2) + if (len > max) max = len + } + END { print max + 0 } + ' +} + +blob_max_path_depth() { + git rev-list --all --objects \ + --filter=object:type=blob --filter-provided-objects | awk ' + NF > 1 { + depth = gsub(/\//, "/", $2) + 1 + if (depth > max) max = depth + } + END { print max + 0 } + ' +} + test_expect_success 'empty repository' ' test_when_finished "rm -rf repo" && git init repo && ( cd repo && - cat >expect <<-\EOF && - | Repository structure | Value | - | -------------------- | ------ | - | * References | | - | * Count | 0 | - | * Branches | 0 | - | * Tags | 0 | - | * Remotes | 0 | - | * Others | 0 | - | | | - | * Reachable objects | | - | * Count | 0 | - | * Commits | 0 | - | * Trees | 0 | - | * Blobs | 0 | - | * Tags | 0 | - | * Inflated size | 0 B | - | * Commits | 0 B | - | * Trees | 0 B | - | * Blobs | 0 B | - | * Tags | 0 B | - | * Disk size | 0 B | - | * Commits | 0 B | - | * Trees | 0 B | - | * Blobs | 0 B | - | * Tags | 0 B | - EOF - git repo structure >out 2>err && - - test_cmp expect out && + test_grep "Repository structure" out && + test_grep "\\* References" out && + test_grep "\\* Reachable objects" out && + test_grep "Largest disk size" out && + test_grep "Deepest tag chain" out && test_line_count = 0 err ) ' @@ -75,40 +207,13 @@ test_expect_success SHA1 'repository with references and objects' ' # Also creates a commit, tree, and blob. git notes add -m foo && - # The tags disk size is handled specially due to the - # git-rev-list(1) --disk-usage=human option printing the full - # "byte/bytes" unit string instead of just "B". - cat >expect <<-EOF && - | Repository structure | Value | - | -------------------- | ---------- | - | * References | | - | * Count | 4 | - | * Branches | 1 | - | * Tags | 1 | - | * Remotes | 1 | - | * Others | 1 | - | | | - | * Reachable objects | | - | * Count | 3.02 k | - | * Commits | 1.01 k | - | * Trees | 1.01 k | - | * Blobs | 1.01 k | - | * Tags | 1 | - | * Inflated size | 16.03 MiB | - | * Commits | 217.92 KiB | - | * Trees | 15.81 MiB | - | * Blobs | 11.68 KiB | - | * Tags | 132 B | - | * Disk size | $(object_type_disk_usage all true) | - | * Commits | $(object_type_disk_usage commit true) | - | * Trees | $(object_type_disk_usage tree true) | - | * Blobs | $(object_type_disk_usage blob true) | - | * Tags | $(object_type_disk_usage tag) B | - EOF - git repo structure >out 2>err && - - test_cmp expect out && + test_grep "\\* References" out && + test_grep "\\* Reachable objects" out && + test_grep "Largest commit" out && + test_grep "Largest disk size" out && + test_grep "Largest parent count" out && + test_grep "Deepest tag chain" out && test_line_count = 0 err ) ' @@ -122,18 +227,37 @@ test_expect_success SHA1 'keyvalue and nul format' ' git tag -a foo -m bar && cat >expect <<-EOF && + references.count=$(reference_count_total) references.branches.count=1 references.tags.count=1 references.remotes.count=0 references.others.count=0 + objects.count=$(object_count_total) objects.commits.count=42 objects.trees.count=42 objects.blobs.count=42 objects.tags.count=1 + objects.inflated_size=$(object_total_inflated_size) objects.commits.inflated_size=9225 objects.trees.inflated_size=28554 objects.blobs.inflated_size=453 objects.tags.inflated_size=132 + objects.max_inflated_size=$(object_max_inflated_size) + objects.commits.max_inflated_size=$(object_type_max_inflated_size commit) + objects.trees.max_inflated_size=$(object_type_max_inflated_size tree) + objects.blobs.max_inflated_size=$(object_type_max_inflated_size blob) + objects.tags.max_inflated_size=$(object_type_max_inflated_size tag) + objects.disk_size=$(object_type_disk_usage all) + objects.max_disk_size=$(object_max_disk_size) + objects.commits.max_disk_size=$(object_type_max_disk_size commit) + objects.trees.max_disk_size=$(object_type_max_disk_size tree) + objects.blobs.max_disk_size=$(object_type_max_disk_size blob) + objects.tags.max_disk_size=$(object_type_max_disk_size tag) + objects.commits.max_parent_count=$(commit_max_parent_count) + objects.trees.max_entry_count=$(tree_max_entry_count) + objects.blobs.max_path_length=$(blob_max_path_length) + objects.blobs.max_path_depth=$(blob_max_path_depth) + objects.tags.max_chain_depth=$(tag_max_chain_depth) objects.commits.disk_size=$(object_type_disk_usage commit) objects.trees.disk_size=$(object_type_disk_usage tree) objects.blobs.disk_size=$(object_type_disk_usage blob) -- gitgitgadget