From: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
To: Alex.Crezoff@gmail.com
Cc: Junio C Hamano <gitster@pobox.com>,
GIT Mailing-list <git@vger.kernel.org>
Subject: [PATCH] t6006-*.sh: Fix truncation tests
Date: Tue, 20 May 2014 14:54:20 +0100 [thread overview]
Message-ID: <537B5E8C.3070803@ramsay1.demon.co.uk> (raw)
Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
---
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
$
(if you have bash as /bin/sh you get different but related errors).
The additional quoting suppresses the 'command redirection' errors, etc...
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
next reply other threads:[~2014-05-20 13:54 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-20 13:54 Ramsay Jones [this message]
2014-05-20 14:19 ` [PATCH] t6006-*.sh: Fix truncation tests Alexey Shumkin
2014-05-20 14:34 ` Alexey Shumkin
2014-05-20 15:01 ` Ramsay Jones
2014-05-20 16:02 ` Alexey Shumkin
2014-05-20 16:43 ` Ramsay Jones
2014-05-20 17:10 ` Junio C Hamano
2014-05-21 4:11 ` Alexey Shumkin
2014-05-20 14:48 ` [PATCH] t6006 (rev-list-format): quote format strings to avoid error on some shells Alexey Shumkin
2014-05-20 15:03 ` Ramsay Jones
2014-05-21 12:59 ` Alexey Shumkin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=537B5E8C.3070803@ramsay1.demon.co.uk \
--to=ramsay@ramsay1.demon.co.uk \
--cc=Alex.Crezoff@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).