Re: [PATCH v2 3/3] format-patch: check that header line has expected format

2015-12-14 Thread Junio C Hamano
"brian m. carlson"  writes:

> +test_expect_success 'From line has expected format' '
> + git format-patch --stdout v2..v1 >patch2 &&
> + cnt=$(egrep "^From [0-9a-f]{40} Mon Sep 17 00:00:00 2001" patch2 | wc 
> -l) &&

Also, with $_x40, you do not need egrep.

> + test $cnt = 3
> +'
> +
>  test_done
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [PATCH v2 3/3] format-patch: check that header line has expected format

2015-12-14 Thread Junio C Hamano
"brian m. carlson"  writes:

> The format of the "From " header line is very specific to allow
> utilities to detect Git-style patches.  Add a test that the patches
> created are in the expected format.
>
> Signed-off-by: brian m. carlson 
> ---
>  t/t4014-format-patch.sh | 6 ++
>  1 file changed, 6 insertions(+)
>
> diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
> index b740e3da..362bc228 100755
> --- a/t/t4014-format-patch.sh
> +++ b/t/t4014-format-patch.sh
> @@ -1437,4 +1437,10 @@ test_expect_success 'format-patch --zero-commit' '
>   test $cnt = 3
>  '
>  
> +test_expect_success 'From line has expected format' '
> + git format-patch --stdout v2..v1 >patch2 &&
> + cnt=$(egrep "^From [0-9a-f]{40} Mon Sep 17 00:00:00 2001" patch2 | wc 
> -l) &&

Don't you want to anchor the pattern to the right as well?

> + test $cnt = 3
> +'
> +
>  test_done
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH v2 3/3] format-patch: check that header line has expected format

2015-12-13 Thread brian m. carlson
The format of the "From " header line is very specific to allow
utilities to detect Git-style patches.  Add a test that the patches
created are in the expected format.

Signed-off-by: brian m. carlson 
---
 t/t4014-format-patch.sh | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
index b740e3da..362bc228 100755
--- a/t/t4014-format-patch.sh
+++ b/t/t4014-format-patch.sh
@@ -1437,4 +1437,10 @@ test_expect_success 'format-patch --zero-commit' '
test $cnt = 3
 '
 
+test_expect_success 'From line has expected format' '
+   git format-patch --stdout v2..v1 >patch2 &&
+   cnt=$(egrep "^From [0-9a-f]{40} Mon Sep 17 00:00:00 2001" patch2 | wc 
-l) &&
+   test $cnt = 3
+'
+
 test_done
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [PATCH v2 3/3] format-patch: check that header line has expected format

2015-12-13 Thread Torsten Bögershausen
On 13.12.15 18:27, brian m. carlson wrote:
> The format of the "From " header line is very specific to allow
> utilities to detect Git-style patches.  Add a test that the patches
> created are in the expected format.
> 
> Signed-off-by: brian m. carlson 
> ---
>  t/t4014-format-patch.sh | 6 ++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
> index b740e3da..362bc228 100755
> --- a/t/t4014-format-patch.sh
> +++ b/t/t4014-format-patch.sh
> @@ -1437,4 +1437,10 @@ test_expect_success 'format-patch --zero-commit' '
>   test $cnt = 3
>  '
>  
> +test_expect_success 'From line has expected format' '
> + git format-patch --stdout v2..v1 >patch2 &&
> + cnt=$(egrep "^From [0-9a-f]{40} Mon Sep 17 00:00:00 2001" patch2 | wc 
> -l) &&
> + test $cnt = 3

For these kind of things:
test_line_count() is your friend

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html