diff options
| author | Denton Liu <liu.denton@gmail.com> | 2019-11-27 19:53:11 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-11-29 21:20:14 (GMT) |
| commit | 9b5a9fa60a444058c07c6f8df08fd779aaebfaae (patch) | |
| tree | 815354765890f166321d3459f9c1b55daa84c497 | |
| parent | 17aa9d9c1af316d60ce6573daf0ff7b28bf009ed (diff) | |
| download | git-9b5a9fa60a444058c07c6f8df08fd779aaebfaae.zip git-9b5a9fa60a444058c07c6f8df08fd779aaebfaae.tar.gz git-9b5a9fa60a444058c07c6f8df08fd779aaebfaae.tar.bz2 | |
t0090: stop losing return codes of git commands
In generate_expected_cache_tree_rec(), there are currently two instances
of `git ls-files` in the upstream of a pipe. In the case where the
upstream git command fails, its return code will be lost. Extract the
`git ls-files` into its own call so that if it ever fails, its return
code is not lost.
Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t0090-cache-tree.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/t/t0090-cache-tree.sh b/t/t0090-cache-tree.sh index ce9a4a5..5a63369 100755 --- a/t/t0090-cache-tree.sh +++ b/t/t0090-cache-tree.sh @@ -21,9 +21,10 @@ generate_expected_cache_tree_rec () { parent="$2" && # 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) && + git ls-files >files && + subtrees=$(grep / files|cut -d / -f 1|uniq) && subtree_count=$(echo "$subtrees"|awk -v c=0 '$1 != "" {++c} END {print c}') && - entries=$(git ls-files|wc -l) && + entries=$(wc -l <files) && printf "SHA $dir (%d entries, %d subtrees)\n" "$entries" "$subtree_count" && for subtree in $subtrees do |