Merge branch 'dt/cache-tree-repair'
This fixes a topic that has graduated to 'master'. * dt/cache-tree-repair: t0090: avoid passing empty string to printf %d
This commit is contained in:
commit
e2ebb5c433
@ -22,7 +22,7 @@ generate_expected_cache_tree_rec () {
|
|||||||
# ls-files might have foo/bar, foo/bar/baz, and foo/bar/quux
|
# ls-files might have foo/bar, foo/bar/baz, and foo/bar/quux
|
||||||
# We want to count only foo because it's the only direct child
|
# We want to count only foo because it's the only direct child
|
||||||
subtrees=$(git ls-files|grep /|cut -d / -f 1|uniq) &&
|
subtrees=$(git ls-files|grep /|cut -d / -f 1|uniq) &&
|
||||||
subtree_count=$(echo "$subtrees"|awk '$1 {++c} END {print c}') &&
|
subtree_count=$(echo "$subtrees"|awk -v c=0 '$1 {++c} END {print c}') &&
|
||||||
entries=$(git ls-files|wc -l) &&
|
entries=$(git ls-files|wc -l) &&
|
||||||
printf "SHA $dir (%d entries, %d subtrees)\n" "$entries" "$subtree_count" &&
|
printf "SHA $dir (%d entries, %d subtrees)\n" "$entries" "$subtree_count" &&
|
||||||
for subtree in $subtrees
|
for subtree in $subtrees
|
||||||
|
Loading…
Reference in New Issue
Block a user