Re: [PATCH] t6006-*.sh: Fix truncation tests

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Tue, May 20, 2014 at 02:54:20PM +0100, Ramsay Jones wrote:
> 
> Signed-off-by: Ramsay Jones <ramsay@xxxxxxxxxxxxxxxxxxx>
> ---
> 
> Hi Alexey,
> 
> If you need to re-roll your 'as/pretty-truncate' branch, could
> you please squash the relevant parts of this patch into the
> corresponding patches of your patch series. (ie this is a patch
> against the head of the current pu branch ...).
> 
> Without this patch I get:
> 
>   $ ./t6006-rev-list-format.sh
>   ok 1 - setup
>   ok 2 - format percent
>   ok 3 - format hash
>   ok 4 - format tree
>   ok 5 - format parents
>   ok 6 - format author
>   ok 7 - format committer
>   ok 8 - format encoding
>   ok 9 - format subject
>   ./t6006-rev-list-format.sh: 152: ./t6006-rev-list-format.sh: Syntax error: "(" unexpected
>   FATAL: Unexpected exit with code 2
>   $ 
Ooops, my fault.
> 
> (if you have bash as /bin/sh you get different but related errors).
> The additional quoting suppresses the 'command redirection' errors, etc...
It's strange but I do have Bash as /bin/sh and unfortunately I have no
this error

AFAIU, Junio already applied my patches (existance of a branch
as/pretty-truncate tells us that). So, we can only send other patches that
fix errors brought with former patches.
You can send, too.
> 
> Thanks.
> 
> ATB
> Ramsay Jones
> 
>  t/t6006-rev-list-format.sh | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/t/t6006-rev-list-format.sh b/t/t6006-rev-list-format.sh
> index 9bc089b..e1dec3e 100755
> --- a/t/t6006-rev-list-format.sh
> +++ b/t/t6006-rev-list-format.sh
> @@ -149,7 +149,7 @@ commit $head1
>  $added
>  EOF
>  
> -test_format subject-truncated %<($truncate_count,trunc)%s <<EOF
> +test_format subject-truncated %\<\($truncate_count,trunc\)%s <<EOF
>  commit $head2
>  changed (ge${changed_utf8_part}ndert)..
>  commit $head1
> @@ -256,7 +256,7 @@ commit $head1
>  $added_iso88591
>  EOF
>  
> -test_format complex-subject-trunc %<($truncate_count,trunc)%s <<EOF
> +test_format complex-subject-trunc %\<\($truncate_count,trunc\)%s <<EOF
>  commit $head3
>  Test printing of c..
>  commit $head2
> @@ -265,7 +265,7 @@ commit $head1
>  added (hinzugef${added_utf8_part_iso88591}gt..
>  EOF
>  
> -test_format complex-subject-mtrunc %<($truncate_count,mtrunc)%s <<EOF
> +test_format complex-subject-mtrunc %\<\($truncate_count,mtrunc\)%s <<EOF
>  commit $head3
>  Test prin..ex bodies
>  commit $head2
> @@ -274,7 +274,7 @@ commit $head1
>  added (hi..f${added_utf8_part_iso88591}gt) foo
>  EOF
>  
> -test_format complex-subject-ltrunc %<($truncate_count,ltrunc)%s <<EOF
> +test_format complex-subject-ltrunc %\<\($truncate_count,ltrunc\)%s <<EOF
>  commit $head3
>  .. of complex bodies
>  commit $head2
> @@ -311,7 +311,7 @@ commit $head1
>  $added
>  EOF
>  
> -test_format complex-subject-commitencoding-unset-trunc %<($truncate_count,trunc)%s <<EOF
> +test_format complex-subject-commitencoding-unset-trunc %\<\($truncate_count,trunc\)%s <<EOF
>  commit $head3
>  Test printing of c..
>  commit $head2
> @@ -320,7 +320,7 @@ commit $head1
>  added (hinzugef${added_utf8_part}gt..
>  EOF
>  
> -test_format complex-subject-commitencoding-unset-mtrunc %<($truncate_count,mtrunc)%s <<EOF
> +test_format complex-subject-commitencoding-unset-mtrunc %\<\($truncate_count,mtrunc\)%s <<EOF
>  commit $head3
>  Test prin..ex bodies
>  commit $head2
> @@ -329,7 +329,7 @@ commit $head1
>  added (hi..f${added_utf8_part}gt) foo
>  EOF
>  
> -test_format complex-subject-commitencoding-unset-ltrunc %<($truncate_count,ltrunc)%s <<EOF
> +test_format complex-subject-commitencoding-unset-ltrunc %\<\($truncate_count,ltrunc\)%s <<EOF
>  commit $head3
>  .. of complex bodies
>  commit $head2
> -- 
> 1.9.0

-- 
Alexey Shumkin
E-mail: Alex.Crezoff@xxxxxxxxx
ICQ: 118001447
Jabber (GoogleTalk): Alex.Crezoff@xxxxxxxxx
Skype: crezoff
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]