From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: Marc Branchaud <marcnarc@xiplink.com>,
git@vger.kernel.org, Michael Haggerty <mhagger@alum.mit.edu>,
Stefan Beller <sbeller@google.com>
Subject: Re: [PATCHv2 0/3] Make diff plumbing commands respect the indentHeuristic.
Date: Sun, 30 Apr 2017 18:11:48 -0700 [thread overview]
Message-ID: <xmqqlgqhjs8b.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20170429131439.ohgren3i7xr4tjex@sigill.intra.peff.net> (Jeff King's message of "Sat, 29 Apr 2017 09:14:40 -0400")
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?
Thanks.
next prev parent reply other threads:[~2017-05-01 1:16 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-25 17:21 BUG: diff-{index,files,tree} (and git-gui) do not respect the diff.indentHeuristic config setting Marc Branchaud
2017-04-25 21:27 ` Jeff King
2017-04-27 20:50 ` [PATCH 0/2] Make diff plumbing commands respect the indentHeuristic Marc Branchaud
2017-04-27 20:50 ` [PATCH 1/2] Make the indent heuristic part of diff's basic configuration Marc Branchaud
2017-04-28 7:59 ` Jeff King
2017-04-27 20:50 ` [PATCH 2/2] Have the diff-* builtins configure diff before initializing revisions Marc Branchaud
2017-04-28 8:06 ` Jeff King
2017-05-01 1:01 ` Junio C Hamano
2017-05-01 5:17 ` Jeff King
2017-05-01 5:29 ` Jeff King
2017-04-28 7:56 ` [PATCH 0/2] Make diff plumbing commands respect the indentHeuristic Jeff King
2017-04-28 17:34 ` Stefan Beller
2017-04-28 22:04 ` Jeff King
2017-04-28 22:13 ` Stefan Beller
2017-05-01 10:34 ` Ævar Arnfjörð Bjarmason
2017-05-09 3:16 ` Jeff King
2017-05-09 4:06 ` Junio C Hamano
2017-05-09 7:58 ` Ævar Arnfjörð Bjarmason
2017-05-09 8:04 ` Jeff King
2017-04-28 22:33 ` [PATCHv2 0/3] " Marc Branchaud
2017-04-28 22:33 ` [PATCHv2 1/3] diff: make the indent heuristic part of diff's basic configuration Marc Branchaud
2017-04-28 22:33 ` [PATCHv2 2/3] diff: have the diff-* builtins configure diff before initializing revisions Marc Branchaud
2017-04-28 22:33 ` [PATCH 3/3] diff: enable indent heuristic by default Marc Branchaud
2017-04-29 12:40 ` [PATCHv2 0/3] Make diff plumbing commands respect the indentHeuristic Jeff King
2017-04-29 13:14 ` Jeff King
2017-05-01 1:11 ` Junio C Hamano [this message]
2017-05-01 5:15 ` Jeff King
2017-05-01 23:25 ` Junio C Hamano
2017-05-01 22:13 ` [PATCHv3 0/4] " Marc Branchaud
2017-05-01 22:13 ` [PATCHv3 1/4] diff: make the indent heuristic part of diff's basic configuration Marc Branchaud
2017-05-01 22:13 ` [PATCHv3 2/4] diff: have the diff-* builtins configure diff before initializing revisions Marc Branchaud
2017-05-01 22:13 ` [PATCHv3 3/4] diff: enable indent heuristic by default Marc Branchaud
2017-05-01 22:20 ` Jeff King
2017-05-01 22:13 ` [PATCHv3 4/4] add--interactive: drop diff.indentHeuristic handling Marc Branchaud
2017-05-01 22:18 ` [PATCHv3 0/4] Make diff plumbing commands respect the indentHeuristic Stefan Beller
2017-04-29 13:15 ` [PATCH 4/3] add--interactive: drop diff.indentHeuristic handling Jeff King
2017-04-30 3:26 ` [PATCHv2 0/3] Make diff plumbing commands respect the indentHeuristic Michael Haggerty
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqlgqhjs8b.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=marcnarc@xiplink.com \
--cc=mhagger@alum.mit.edu \
--cc=peff@peff.net \
--cc=sbeller@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).