* [PATCH] t0003-attributes.sh: Don't overwrite t/.gitattributes
@ 2012-10-13 17:44 Ramsay Jones
2012-10-14 2:37 ` Nguyen Thai Ngoc Duy
0 siblings, 1 reply; 2+ messages in thread
From: Ramsay Jones @ 2012-10-13 17:44 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Nguyen Thai Ngoc Duy, GIT Mailing-list
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(-)
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] t0003-attributes.sh: Don't overwrite t/.gitattributes
2012-10-13 17:44 [PATCH] t0003-attributes.sh: Don't overwrite t/.gitattributes Ramsay Jones
@ 2012-10-14 2:37 ` Nguyen Thai Ngoc Duy
0 siblings, 0 replies; 2+ messages in thread
From: Nguyen Thai Ngoc Duy @ 2012-10-14 2:37 UTC (permalink / raw)
To: Ramsay Jones; +Cc: Junio C Hamano, GIT Mailing-list
On Sun, Oct 14, 2012 at 12:44 AM, Ramsay Jones
<ramsay@ramsay1.demon.co.uk> wrote:
>
> 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.
> 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-10-14 2:37 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-13 17:44 [PATCH] t0003-attributes.sh: Don't overwrite t/.gitattributes Ramsay Jones
2012-10-14 2:37 ` Nguyen Thai Ngoc Duy
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).