From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS3215 2.6.0.0/16 X-Spam-Status: No, score=-3.8 required=3.0 tests=AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by dcvr.yhbt.net (Postfix) with ESMTP id 23A3D1F4D7 for ; Mon, 20 Jun 2022 22:17:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238652AbiFTWRL convert rfc822-to-8bit (ORCPT ); Mon, 20 Jun 2022 18:17:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33716 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230366AbiFTWRK (ORCPT ); Mon, 20 Jun 2022 18:17:10 -0400 Received: from elephants.elehost.com (elephants.elehost.com [216.66.27.132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ED8FD19C3D for ; Mon, 20 Jun 2022 15:17:09 -0700 (PDT) Received: from Mazikeen (cpe00fc8d49d843-cm00fc8d49d840.cpe.net.cable.rogers.com [174.119.96.21] (may be forged)) (authenticated bits=0) by elephants.elehost.com (8.16.1/8.16.1) with ESMTPSA id 25KMH66d071968 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Mon, 20 Jun 2022 18:17:06 -0400 (EDT) (envelope-from rsbecker@nexbridge.com) Reply-To: From: To: "'Derrick Stolee'" , "'Junio C Hamano'" Cc: , References: <00a401d884d0$32885890$979909b0$@nexbridge.com> <8d2a0a36-1d2f-c723-db1e-8978e5d03d1d@github.com> <00b501d884d7$d8ed1200$8ac73600$@nexbridge.com> <495bd957-43dc-f252-657d-2969bb7ad5f3@github.com> In-Reply-To: <495bd957-43dc-f252-657d-2969bb7ad5f3@github.com> Subject: RE: Test Failure t5510,t5562 - was RE: [ANNOUNCE] Git v2.37.0-rc1 Date: Mon, 20 Jun 2022 18:17:01 -0400 Organization: Nexbridge Inc. Message-ID: <00e001d884f3$79f8d6a0$6dea83e0$@nexbridge.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8BIT X-Mailer: Microsoft Outlook 16.0 Content-Language: en-ca Thread-Index: AQGbty4YZi8TaCT7HXBORJwwZ7F75wEiX5VOAgU1x3MCW0ymCa2mRxvA Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org >-----Original Message----- >From: Derrick Stolee >Sent: June 20, 2022 4:00 PM >To: rsbecker@nexbridge.com; 'Junio C Hamano' >Cc: git@vger.kernel.org; avarab@gmail.com >Subject: Re: Test Failure t5510,t5562 - was RE: [ANNOUNCE] Git v2.37.0-rc1 > >On 6/20/22 2:59 PM, rsbecker@nexbridge.com wrote: >> On June 20, 2022 2:46 PM, Derrick Stolee wrote: > >>> The issue is this line (some tabs removed): >>> >>> new_cmdline=$(printf "%s" "$cmdline" | perl -pe >>> 's[origin(?!/)]["'"$remote_url"'"]g') >>> >>> At this point, $remote_url contains the file path including the @ >>> symbol. However, this perl invocation is dropping everything starting at the @ >to the next slash. >>> >>> I'm not sure of a better way to accomplish what is trying to be done >>> here (replace 'origin' with that specific url) without maybe causing other issues. >>> >>> This line was introduced by e1790f9245f (fetch tests: fetch >>> as well as fetch [], 2018-02-09). >> >> How about using sed instead of perl for this? > >I wasn't sure if using sed would create a different kind of replacement problem, >but using single-quotes seems to get around that kind of issue. > >Please see the patch below. I'm currently running CI in a GGG PR [1] > >[1] https://github.com/gitgitgadget/git/pull/1267 > >Thanks, >-Stolee > > >--- >8 --- > >>>From 1df4fc66d4a62adc7087d7d22c8d78842b4e9b4d Mon Sep 17 00:00:00 2001 >From: Derrick Stolee >Date: Mon, 20 Jun 2022 15:52:09 -0400 >Subject: [PATCH] t5510: replace 'origin' with URL more carefully > >The many test_configured_prune tests in t5510-fetch.sh test many combinations >of --prune, --prune-tags, and using 'origin' or an explicit URL. Some machinery was >introduced in e1790f9245f (fetch tests: fetch as well as fetch >[], 2018-02-09) to replace 'origin' with this explicit URL. This URL is a >"file:///" URL for the root of the $TRASH_DIRECTORY. > >However, if the current build tree has an '@' symbol, the replacement using perl >fails. It drops the '@' as well as anything else in that directory name. > >You can verify this locally by cloning git.git into a "victim@03" >directory and running the test script. > >To resolve this issue, replace the perl invocation with two sed commands. These >two are used to ensure that we match exactly on the whole word 'origin'. We can >guarantee that the word boundaries are spaces in our tests. The reason to use >exact words is that sometimes a refspec is supplied, such as >"+refs/heads/*:refs/remotes/origin/*" which would cause an incorrect >replacement. The two commands are used because there is not a clear POSIX way >to match on word boundaries without getting extremely pedantic about what >possible characters we could have at the boundaries. > >Reported-by: Randall Becker >Signed-off-by: Derrick Stolee >--- > t/t5510-fetch.sh | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > >diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh index 4620f0ca7fa..8ca3aa5e931 >100755 >--- a/t/t5510-fetch.sh >+++ b/t/t5510-fetch.sh >@@ -853,7 +853,9 @@ test_configured_prune_type () { > then > new_cmdline=$cmdline_setup > else >- new_cmdline=$(printf "%s" "$cmdline" | perl -pe >'s[origin(?!/)]["'"$remote_url"'"]g') >+ new_cmdline=$(printf "%s" "$cmdline" | \ >+ sed "s~origin ~'$remote_url' ~g" | \ >+ sed "s~ origin~ '$remote_url'~g") > fi > > if test "$fetch_prune_tags" = 'true' || Ok, this seems to work. I have the test environment set up so can retest other options.