diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-10-14 10:49:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-10-14 10:49:12 -0700 |
| commit | e2ebb5c433c12ee296ea9b289c8b9cabb576cbeb (patch) | |
| tree | edbcdd404261e55ff1163aec59c4b02fa953ee85 /t | |
| parent | 792a5723207330f473d64f0c6e32a17e5535a265 (diff) | |
| parent | c8db708d5d865a2085230687689868520863abe1 (diff) | |
| download | git-e2ebb5c433c12ee296ea9b289c8b9cabb576cbeb.tar.gz | |
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
Diffstat (limited to 't')
| -rwxr-xr-x | t/t0090-cache-tree.sh | 2 |
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 |