Re: [PATCH 2/2] t0000: avoid masking git exit value through pipes
Carlo Marcelo Arenas Belón <carenas@gmail.com> writes:
> 9af0b8dbe2 (t0000-basic: more commit-tree tests., 2006-04-26) adds
> tets for commit-tree that mask the return exit from git as described
"tests" (no need to resend---already locally tweaked).
Thanks.
Show 54 quoted lines
> in a378fee5b07.
>
> Fix the tests, to avoid pipes by using instead a temporary file.
>
> Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com>
> ---
> t/t0000-basic.sh | 23 ++++++++++++++---------
> 1 file changed, 14 insertions(+), 9 deletions(-)
>
> diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh
> index cb87768513..545ff5af13 100755
> --- a/t/t0000-basic.sh
> +++ b/t/t0000-basic.sh
> @@ -1270,26 +1270,31 @@ test_expect_success 'no diff after checkout and git update-index --refresh' '
> P=$(test_oid root)
>
> test_expect_success 'git commit-tree records the correct tree in a commit' '
> - commit0=$(echo NO | git commit-tree $P) &&
> - tree=$(git show --pretty=raw $commit0 |
> - sed -n -e "s/^tree //p" -e "/^author /q") &&
> + echo NO | git commit-tree $P >out &&
> + commit0=$(cat out) &&
> + git show --pretty=raw $commit0 >out &&
> + tree=$(cat out | sed -n -e "s/^tree //p" -e "/^author /q") &&
> test "z$tree" = "z$P"
> '
>
> test_expect_success 'git commit-tree records the correct parent in a commit' '
> - commit1=$(echo NO | git commit-tree $P -p $commit0) &&
> - parent=$(git show --pretty=raw $commit1 |
> - sed -n -e "s/^parent //p" -e "/^author /q") &&
> + echo NO | git commit-tree $P -p $commit0 >out &&
> + commit1=$(cat out) &&
> + git show --pretty=raw $commit1 >out &&
> + parent=$(cat out | sed -n -e "s/^parent //p" -e "/^author /q") &&
> test "z$commit0" = "z$parent"
> '
>
> test_expect_success 'git commit-tree omits duplicated parent in a commit' '
> - commit2=$(echo NO | git commit-tree $P -p $commit0 -p $commit0) &&
> - parent=$(git show --pretty=raw $commit2 |
> + echo NO | git commit-tree $P -p $commit0 -p $commit0 >out &&
> + commit2=$(cat out) &&
> + git show --pretty=raw $commit2 >out &&
> + parent=$(cat out |
> sed -n -e "s/^parent //p" -e "/^author /q" |
> sort -u) &&
> test "z$commit0" = "z$parent" &&
> - numparent=$(git show --pretty=raw $commit2 |
> + git show --pretty=raw $commit2 >out &&
> + numparent=$(cat out |
> sed -n -e "s/^parent //p" -e "/^author /q" |
> wc -l) &&
> test $numparent = 1
Junio C Hamano <gitster@pobox.com>