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

Re: [PATCHv2 0/3] Make diff plumbing commands respect the indentHeuristic.

From
Jeff King <peff@peff.net>
Date
May 1, 2017, 05:15 UTC
Message-ID
<20170501051528.tpw3zlcpercdwdln@sigill.intra.peff.net>
In-Reply-To
<xmqqlgqhjs8b.fsf@gitster.mtv.corp.google.com>
On Sun, Apr 30, 2017 at 06:11:48PM -0700, Junio C Hamano wrote:
Show 17 quoted lines
> Jeff King <peff@peff.net> writes:
> 
> > diff --git a/t/t4051-diff-function-context.sh b/t/t4051-diff-function-context.sh
> > index 6154acb45..5f46c0341 100755
> > --- a/t/t4051-diff-function-context.sh
> > +++ b/t/t4051-diff-function-context.sh
> > @@ -72,7 +72,7 @@ test_expect_success 'setup' '
> >  
> >  	# overlap function context of 1st change and -u context of 2nd change
> >  	grep -v "delete me from hello" <"$dir/hello.c" >file.c &&
> > -	sed 2p <"$dir/dummy.c" >>file.c &&
> > +	sed "2aextra line" <"$dir/dummy.c" >>file.c &&
> 
> I've never used 'a' (or 'i') command of sed without having it
> immediately followed by a backslash-newline in my scripts.  How
> portable is this addition, I have to wonder.  Can BSD folks give it
> a quick test?

I think you're right that it needs the backslash. It's so rarely used that I always forget which one is the portable way.

-Peff
PS Outside of our test scripts, I'd probably just have written:
     perl -lpe 'print "extra line" if $. == 2'
   I think we have traditionally preferred sed/awk to perl, but given
   the heavy use of vanilla perl elsewhere in the test suite, I think
   that is maybe just superstition at this point.
Previous: Junio C HamanoNext: Junio C Hamano
Message 25 of 35 in “Make diff plumbing commands respect the indentHeuristic.”
  1. 0/2 Make diff plumbing commands respect the indentHeuristic.Marc Branchaud, Apr 27, 2017
  2. 2/2 Have the diff-* builtins configure diff before initializing revisions.Marc Branchaud, Apr 27, 2017
  3. Jeff KingApr 28, 2017
  4. Junio C HamanoMay 1, 2017
  5. Jeff KingMay 1, 2017
  6. Jeff KingMay 1, 2017
  7. 1/2 Make the indent heuristic part of diff's basic configuration.Marc Branchaud, Apr 27, 2017
  8. Jeff KingApr 28, 2017
  9. Jeff KingApr 28, 2017
  10. Stefan BellerApr 28, 2017
  11. Jeff KingApr 28, 2017
  12. Stefan BellerApr 28, 2017
  13. Ævar Arnfjörð BjarmasonMay 1, 2017
  14. Jeff KingMay 9, 2017
  15. Junio C HamanoMay 9, 2017
  16. Ævar Arnfjörð BjarmasonMay 9, 2017
  17. Jeff KingMay 9, 2017
  18. 0/3 Make diff plumbing commands respect the indentHeuristic.Marc Branchaud, Apr 28, 2017
  19. 1/3 diff: make the indent heuristic part of diff's basic configurationMarc Branchaud, Apr 28, 2017
  20. 2/3 diff: have the diff-* builtins configure diff before initializing revisionsMarc Branchaud, Apr 28, 2017
  21. 3/3 diff: enable indent heuristic by defaultMarc Branchaud, Apr 28, 2017
  22. Jeff KingApr 29, 2017
  23. Jeff KingApr 29, 2017
  24. Junio C HamanoMay 1, 2017
  25. Jeff KingMay 1, 2017
  26. Junio C HamanoMay 1, 2017
  27. 0/4 Make diff plumbing commands respect the indentHeuristic.Marc Branchaud, May 1, 2017
  28. 2/4 diff: have the diff-* builtins configure diff before initializing revisionsMarc Branchaud, May 1, 2017
  29. 1/4 diff: make the indent heuristic part of diff's basic configurationMarc Branchaud, May 1, 2017
  30. 4/4 add--interactive: drop diff.indentHeuristic handlingMarc Branchaud, May 1, 2017
  31. 3/4 diff: enable indent heuristic by defaultMarc Branchaud, May 1, 2017
  32. Jeff KingMay 1, 2017
  33. Stefan BellerMay 1, 2017
  34. 4/3 add--interactive: drop diff.indentHeuristic handlingJeff King, Apr 29, 2017
  35. Michael HaggertyApr 30, 2017

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.