Re: [PATCH] interpret-trailers: obey scissors lines

Brian Malehorn writes: >> The mention of "'commit -v -s' works that way, too" was my attempt >> to justify why it is OK to make this change unconditionally to >> intepret-trailers, but I am still not 100% convinced with that >> reasoning (or your original log message) that

Re: [PATCH] interpret-trailers: obey scissors lines

Alright, I've made a new patch based on this feedback: * make indentation consistent with rest of test file again * rename function to wt_status_locate_end() * rephrase commit message; add paragraph about wt_status_locate_end() * s/scissors/cut line/ * Signed-off-by: me > The mention of

Re: [PATCH] interpret-trailers: obey scissors lines

Junio C Hamano writes: > This can be done by the same logic as the existing helper > function, wt_status_truncate_message_at_cut_line(), uses, > but it wants the caller to pass a strbuf to it. Because the > helper function ignore_non_trailer()

Re: [PATCH] interpret-trailers: obey scissors lines

Brian Malehorn writes: > If a commit message is being edited as "verbose", it will contain a > scissors string ("-- >8 --") and a diff: > > my subject > > # >8 > # Do not touch the line above. > # Everything

Re: [PATCH] interpret-trailers: obey scissors lines

On Mon, May 15, 2017 at 12:32:24PM +0900, Junio C Hamano wrote: > Jeff King writes: > > > On Mon, May 15, 2017 at 11:12:03AM +0900, Junio C Hamano wrote: > > > >> >> diff --git a/builtin/commit.c b/builtin/commit.c > >> >> index 2de5f6cc6..2ce9c339d 100644 > >> >> ---

Re: [PATCH] interpret-trailers: obey scissors lines

Jeff King writes: > On Mon, May 15, 2017 at 11:12:03AM +0900, Junio C Hamano wrote: > >> >> diff --git a/builtin/commit.c b/builtin/commit.c >> >> index 2de5f6cc6..2ce9c339d 100644 >> >> --- a/builtin/commit.c >> >> +++ b/builtin/commit.c >> >> @@ -1735,7 +1735,8 @@ int

Re: [PATCH] interpret-trailers: obey scissors lines

On Sun, May 14, 2017 at 01:33:48AM -0700, Brian Malehorn wrote: > > And two, we usually indent the contents to the same level as the outer > > cat/EOF pair > > Fixed. > > I was indenting the same as the other tests in that file. But if the way > you described is the preferred way, then sure.

Re: [PATCH] interpret-trailers: obey scissors lines

On Mon, May 15, 2017 at 11:12:03AM +0900, Junio C Hamano wrote: > >> diff --git a/builtin/commit.c b/builtin/commit.c > >> index 2de5f6cc6..2ce9c339d 100644 > >> --- a/builtin/commit.c > >> +++ b/builtin/commit.c > >> @@ -1735,7 +1735,8 @@ int cmd_commit(int argc, const char **argv, const > >>

Re: [PATCH] interpret-trailers: obey scissors lines

Jeff King writes: >> If a commit message is being editted as "verbose", it will contain a >> scissors string ("-- >8 --") and a diff: >> >> my subject >> >> # >8 >> # Do not touch the line above. >> # Everything

[PATCH] interpret-trailers: obey scissors lines

If a commit message is being edited as "verbose", it will contain a scissors string ("-- >8 --") and a diff: my subject # >8 # Do not touch the line above. # Everything below will be removed. diff --git a/foo.txt b/foo.txt

Re: [PATCH] interpret-trailers: obey scissors lines

> One, we'd usually use "\EOF" here unless you > really do want to interpolate inside the here document. Fixed, and I learned something new. > And two, we usually indent the contents to the same level as the outer > cat/EOF pair Fixed. I was indenting the same as the other tests in that file.

Re: [PATCH] interpret-trailers: obey scissors lines

On Sun, May 14, 2017 at 5:39 AM, Brian Malehorn wrote: > If a commit message is being editted as "verbose", it will contain a Typo, should be "edited": https://en.wiktionary.org/wiki/editted

Re: [PATCH] interpret-trailers: obey scissors lines

On Sat, May 13, 2017 at 08:39:23PM -0700, Brian Malehorn wrote: > If a commit message is being editted as "verbose", it will contain a > scissors string ("-- >8 --") and a diff: > > my subject > > # >8 > # Do not touch the line

[PATCH] interpret-trailers: obey scissors lines

If a commit message is being editted as "verbose", it will contain a scissors string ("-- >8 --") and a diff: my subject # >8 # Do not touch the line above. # Everything below will be removed. diff --git a/foo.txt b/foo.txt