Re: [PATCH] t4038: add tests for "diff --cc --raw <trees>"
John Keeping <john@keeping.me.uk> writes:
Show 19 quoted lines
> Signed-off-by: John Keeping <john@keeping.me.uk>
> ---
> ...
> diff --git a/t/t4038-diff-combined.sh b/t/t4038-diff-combined.sh
> index 40277c7..a0701bc 100755
> --- a/t/t4038-diff-combined.sh
> +++ b/t/t4038-diff-combined.sh
> @@ -89,4 +89,33 @@ test_expect_success 'diagnose truncated file' '
> grep "diff --cc file" out
> '
>
> +test_expect_success 'setup for --cc --raw' '
> + blob=$(echo file |git hash-object --stdin -w) &&
> + base_tree=$(echo "100644 blob $blob file" | git mktree) &&
> + trees= &&
> + for i in `test_seq 1 40`
> + do
> + blob=$(echo file$i |git hash-object --stdin -w) &&
> + trees="$trees $(echo "100644 blob $blob file" |git mktree)"
Please have a SP after each of these '|' pipes.
If you collect trees this way:
trees="$trees$(echo ... | git mktree)$LF"
then ...
Show 10 quoted lines
> + done
> +'
> +
> +test_expect_success 'check --cc --raw with four trees' '
> + four_trees=$(echo "$trees" |awk -e "{
> + print \$1
> + print \$2
> + print \$3
> + print \$4
> + }") &&(What's "awk -e"?)
... you can do
echo "$trees" | sed -e 4q
which is less repetitive.
Thanks.
Junio C Hamano <gitster@pobox.com>