diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-01-07 13:10:44 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-01-07 13:10:44 -0800 |
| commit | 40d2f3863598937f93fdff7673bbcc989452b075 (patch) | |
| tree | fb02f9868bae6ed9d6ab2894e5ce140858013e8c | |
| parent | 06a8bbb41d15abf7520f0a2332799d8531a3c313 (diff) | |
| parent | d69360c6b17d1693a60b9f723a3ef5129a62c2e5 (diff) | |
| download | git-40d2f3863598937f93fdff7673bbcc989452b075.tar.gz | |
Merge branch 'bw/maint-0090-awk-tweak'
* bw/maint-0090-awk-tweak:
t0090: tweak awk statement for Solaris /usr/xpg4/bin/awk
| -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 067f4c6e52..601d02d71f 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 -v c=0 '$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 |