Re: [PATCH v1] t9821: use test_config
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Sep 3, 2015, 16:52 UTC
- Message-ID
- <xmqqfv2vla2g.fsf@gitster.mtv.corp.google.com>
- In-Reply-To
- <1C0CF9F4-29EA-4EE0-9DD1-071D57BCFD8B@gmail.com>
Lars Schneider <larsxschneider@gmail.com> writes:
Show 27 quoted lines
> On 03 Sep 2015, at 15:04, Eric Sunshine <sunshine@sunshineco.com> wrote: > >> On Thu, Sep 3, 2015 at 5:34 AM, <larsxschneider@gmail.com> wrote: >>> From: Lars Schneider <larsxschneider@gmail.com> >>> >>> Signed-off-by: Lars Schneider <larsxschneider@gmail.com> >>> --- >>> diff --git a/t/t9821-git-p4-path-variations.sh b/t/t9821-git-p4-path-variations.sh >>> index 81e46ac..5a26fec 100755 >>> --- a/t/t9821-git-p4-path-variations.sh >>> +++ b/t/t9821-git-p4-path-variations.sh >>> @@ -45,7 +45,7 @@ test_expect_success 'Clone root' ' >>> ( >>> cd "$git" && >>> git init . && >>> - git config core.ignorecase false && >>> + test_config core.ignorecase false && >> >> test_config ensures that the config setting gets "unset" at the end of >> the test, whether the test succeeds or not, so that subsequent tests >> are not affected by the setting. However, in this case, since the $git >> repository gets recreated from scratch for each test anyhow, use of >> test_config is superfluous. In fact, it may be slightly >> contraindicated since it could mislead the reader into thinking that >> state is carried over from test to test. (Not a big objections, but >> something to take into consideration.) > OK. Do I need to do anything to take the PATCH suggestion back?
You can just say "I retract this one because...", which you just did.
For the path-encoding patch, I think the following is all that is necessary to be squashed in, but please double check (unless you have some other improvements you want to make on top of v6 of that patch, no need to reroll only for the following).
Thanks.
t/t9822-git-p4-path-encoding.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t9822-git-p4-path-encoding.sh b/t/t9822-git-p4-path-encoding.sh index e507ad7..3646580 100755 --- a/t/t9822-git-p4-path-encoding.sh +++ b/t/t9822-git-p4-path-encoding.sh @@ -39,7 +39,7 @@ test_expect_success 'Clone repo containing iso8859-1 encoded paths with git-p4.p ( cd "$git" && git init . && - test_config git-p4.pathEncoding iso8859-1 && + git config git-p4.pathEncoding iso8859-1 && git p4 clone --use-client-spec --destination="$git" //depot && UTF8="$(printf "$UTF8_ESCAPED")" && echo $UTF8 >expect &&