Junio C Hamano <gitster@xxxxxxxxx> 于2020年11月11日周三 上午4:51写道: > > Jiang Xin <worldhello.net@xxxxxxxxx> writes: > > > diff --git a/t/t5411/common-functions.sh b/t/t5411/common-functions.sh > > index 521a347710..b7cca2d8fb 100644 > > --- a/t/t5411/common-functions.sh > > +++ b/t/t5411/common-functions.sh > > @@ -42,7 +42,7 @@ create_commits_in () { > > make_user_friendly_and_stable_output () { > > sed \ > > -e "s/ *\$//" \ > > - -e "s/ */ /g" \ > > + -e "s/ */ /g" \ > > -e "s/'/\"/g" \ > > -e "s/ / /g" \ > > -e "s/$A/<COMMIT-A>/g" \ > > @@ -52,5 +52,11 @@ make_user_friendly_and_stable_output () { > > -e "s/$(echo $A | cut -c1-7)[0-9a-f]*/<OID-A>/g" \ > > -e "s/$(echo $B | cut -c1-7)[0-9a-f]*/<OID-B>/g" \ > > -e "s#To $URL_PREFIX/upstream.git#To <URL/of/upstream.git>#" \ > > - -e "/^error: / d" > > + -e "/^error: / d" | \ > > + if test $# -eq 0 > > + then > > + cat > > + else > > + sed ${1+"$@"} > > + fi > > } > > I may have suggested it, but looking at this implementation I'd have > to say it is not worth the extra process here. The only reason why > I made the suggestion was that way we can make the single "sed" > invocation to do what we want. > > If you need custom output for just two tests in 5411-0000, define > the custom one that wraps make_user_friendly_and_stable_output in > that single script like so: > > filter_out_remote_messages () { > make_user_friendly_and_stable_output | > sed -n -e ... > } > > and then use that ... Will add new helper function `filter_out_user_friendly_and_stable_output` like this, and use it for 5411-0000, 5411-0001, 5411-0013 and 5411-0014.