git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 1/3] t/lib-httpd: avoid using BSD's sed

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Feb 27, 2020, 15:42 UTC
Message-ID
<nycvar.QRO.7.76.6.2002271640520.46@tvgsbejvaqbjf.bet>
In-Reply-To
<xmqqsgixgfal.fsf@gitster-ct.c.googlers.com>
Hi Junio,
On Wed, 26 Feb 2020, Junio C Hamano wrote:
Show 23 quoted lines
> Junio C Hamano <gitster@pobox.com> writes:
>
> > "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
> > writes:
> >
> >> diff --git a/t/t5537-fetch-shallow.sh b/t/t5537-fetch-shallow.sh
> >> index 9e16512fe31..4f10057e9f1 100755
> >> --- a/t/t5537-fetch-shallow.sh
> >> +++ b/t/t5537-fetch-shallow.sh
> >> @@ -237,7 +237,7 @@ test_expect_success 'shallow fetches check connectivity before writing shallow f
> >>  	git -C "$REPO" config protocol.version 2 &&
> >>  	git -C client config protocol.version 2 &&
> >>
> >> -	git -C client fetch --depth=2 "$HTTPD_URL/one_time_sed/repo" master:a_branch &&
> >> +	git -C client fetch --depth=2 "$HTTPD_URL/one_time_perl/repo" master:a_branch &&
> >>
> >>  	# Craft a situation in which the server sends back an unshallow request
> >>  	# with an empty packfile. This is done by refetching with a shorter
> >> @@ -246,13 +246,13 @@ test_expect_success 'shallow fetches check connectivity before writing shallow f
> >>  	printf "$(test_oid sed)" \
> >
> > Hmm, shouldn't the test-oid token "sed" whose value is set up in the
> > setup section of this test script also be renamed to "perl"?
Ooops...
Show 17 quoted lines
> > Or, if we are actively taking advantage of the fact that the syntax of
> > the replacement operator is the same between the languages, perhaps
> > "sed" is better renamed to something more language agnostic and
> > reflects the purpose/reason why we extend the packet header by two
> > bytes with the one-time munging process?
> >
> >>  	       "$(git -C "$REPO" rev-parse HEAD)" \
> >>  	       "$(git -C "$REPO" rev-parse HEAD^)" \
> >> -	       >"$HTTPD_ROOT_PATH/one-time-sed" &&
> >> +	       >"$HTTPD_ROOT_PATH/one-time-perl" &&
> >
> > Other than that, this step looked quite sensible.  Thanks.
>
> Hmm, is it because you wanted to backport this down to 'maint'
> (otherwise, your tests will start failing in a month) that you left
> the "test_oid sed" thing untouched?  If so, that makes sort-of
> sense.

That's a good point. I target `maint` in v2, and offered an add-on patch meant to be applied on top of the merge into `master` (or `next`, or `pu`).

> I expect that the series will be rerolled, if only for s/BSD/macOS/
> mentioned elsewhere in the thread, but in the meantime, I'll rebase
> them on 'maint' "as a practice" while queuing.
Thanks ;-)

Ciao, Dscho

Previous: Junio C HamanoNext: Johannes Schindelin via GitGitGadget
Message 11 of 16 in “ci: upgrade to the latest Azure Pipelines agent pools”
  1. 0/3 ci: upgrade to the latest Azure Pipelines agent poolsJohannes Schindelin via GitGitGadget, Feb 26, 2020
  2. 3/3 Azure Pipeline: switch to the latest agent poolsJohannes Schindelin via GitGitGadget, Feb 26, 2020
  3. 1/3 t/lib-httpd: avoid using BSD's sedJohannes Schindelin via GitGitGadget, Feb 26, 2020
  4. Ed MasteFeb 26, 2020
  5. Johannes SchindelinFeb 27, 2020
  6. Ed MasteFeb 27, 2020
  7. Johannes SchindelinFeb 27, 2020
  8. CI/PR builds on FreeBSD, was Re: [PATCH 1/3] t/lib-httpd: avoid using BSD's sedJohannes Schindelin, Feb 28, 2020
  9. Junio C HamanoFeb 26, 2020
  10. Junio C HamanoFeb 26, 2020
  11. Johannes SchindelinFeb 27, 2020
  12. 2/3 ci: prevent `perforce` from being quarantinedJohannes Schindelin via GitGitGadget, Feb 26, 2020
  13. 0/3 ci: upgrade to the latest Azure Pipelines agent poolsJohannes Schindelin via GitGitGadget, Feb 27, 2020
  14. 2/3 ci: prevent `perforce` from being quarantinedJohannes Schindelin via GitGitGadget, Feb 27, 2020
  15. 3/3 Azure Pipeline: switch to the latest agent poolsJohannes Schindelin via GitGitGadget, Feb 27, 2020
  16. 1/3 t/lib-httpd: avoid using macOS' sedJohannes Schindelin via GitGitGadget, Feb 27, 2020

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.