[PATCH] t0003-attributes.sh: Don't overwrite t/.gitattributes

Ramsay Jones· Oct 13, 2012, 17:44 UTC · lore

Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
---

Hi Junio,

This test in the current pu branch (commit bb0e6bf "Merge branch 'aw/rebase-am-failure-detection' into pu", 11-10-2012) overwrites the contents of t/.gitattributes. Note that the merge of the two branches 'nd/wildmatch' and 'nd/attr-match-optim-more' both add new tests at the end, and *both* sets initially 'cd ..' ...

ATB, Ramsay Jones

 t/t0003-attributes.sh | 1 -
 1 file changed, 1 deletion(-)

Show changes to t/t0003-attributes.sh +0 −1

diff --git a/t/t0003-attributes.sh b/t/t0003-attributes.sh
index 7ed288f..fe80af7 100755
--- a/t/t0003-attributes.sh
+++ b/t/t0003-attributes.sh
@@ -247,7 +247,6 @@ test_expect_success 'patterns starting with exclamation' '
 '
 
 test_expect_success '"**" test' '
-	cd .. &&
 	echo "**/f foo=bar" >.gitattributes &&
 	cat <<\EOF >expect &&
 f: foo: bar

-- 
1.7.12

Nguyen Thai Ngoc Duy· Oct 14, 2012, 02:37 UTC · re: Ramsay Jones · lore

Re: [PATCH] t0003-attributes.sh: Don't overwrite t/.gitattributes

On Sun, Oct 14, 2012 at 12:44 AM, Ramsay Jones <ramsay@ramsay1.demon.co.uk> wrote:

Show 11 quoted lines

>
> Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
> ---
>
> Hi Junio,
>
> This test in the current pu branch (commit bb0e6bf "Merge branch
> 'aw/rebase-am-failure-detection' into pu", 11-10-2012) overwrites
> the contents of t/.gitattributes. Note that the merge of the two
> branches 'nd/wildmatch' and 'nd/attr-match-optim-more' both add
> new tests at the end, and *both* sets initially 'cd ..' ...

I'm resending nd/wildmatch to move the tests before bare repo tests so "cd .." is no longer necessary. nd/attr-match-optim-more has the same fix.

Show 18 quoted lines

>  t/t0003-attributes.sh | 1 -
>  1 file changed, 1 deletion(-)
>
> diff --git a/t/t0003-attributes.sh b/t/t0003-attributes.sh
> index 7ed288f..fe80af7 100755
> --- a/t/t0003-attributes.sh
> +++ b/t/t0003-attributes.sh
> @@ -247,7 +247,6 @@ test_expect_success 'patterns starting with exclamation' '
>  '
>
>  test_expect_success '"**" test' '
> -       cd .. &&
>         echo "**/f foo=bar" >.gitattributes &&
>         cat <<\EOF >expect &&
>  f: foo: bar
> --
> 1.7.12
>

-- 
Duy

patcht0003-attributes.sh: Don't overwrite t/.gitattributes