summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRené Scharfe <l.s.r@web.de>2014-09-30 19:42:03 +0200
committerJunio C Hamano <gitster@pobox.com>2014-09-30 11:53:23 -0700
commitc8db708d5d865a2085230687689868520863abe1 (patch)
tree7541b6aeb4212fb6521270ef1a35aa76476f9829
parent4ed115e9c545fb27a5b80c751b2c04ec7ecc4d97 (diff)
downloadgit-c8db708d5d865a2085230687689868520863abe1.tar.gz
t0090: avoid passing empty string to printf %ddt/cache-tree-repair
FreeBSD's printf(1) doesn't accept empty strings for numerical format specifiers: $ printf "%d\n" "" >/dev/null; echo $? printf: : expected numeric value 1 Initialize the AWK variable c to make sure the shell variable subtree_count always contains a numerical value, in order to keep the subsequently called printf happy. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t0090-cache-tree.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t0090-cache-tree.sh b/t/t0090-cache-tree.sh
index f9648a8642..158cf4f03b 100755
--- a/t/t0090-cache-tree.sh
+++ b/t/t0090-cache-tree.sh
@@ -22,7 +22,7 @@ generate_expected_cache_tree_rec () {
# 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
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) &&
printf "SHA $dir (%d entries, %d subtrees)\n" "$entries" "$subtree_count" &&
for subtree in $subtrees