Re: [PATCH] Teach 'git-apply --whitespace=strip' to remove empty lines at the end of file

2 messages, 2 authors, 2016-06-15 · open the first message on its own page

Re: [PATCH] Teach 'git-apply --whitespace=strip' to remove empty lines at the end of file

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:43:11

"Marco Costalba" [off-list ref] writes:
Signed-off-by: Marco Costalba <redacted>
---

This one seems to pass all the tests.
I think this happens to work because you are not feeding -u0
patch; if you have more than one context, then a hunk that ends
with + line is guaranteed to apply only at the end,  With a
diff prepared with -u0, that is not true anymore, is it?

We can argue that -u0 patch is crazy but we do support them.

Re: [PATCH] Teach 'git-apply --whitespace=strip' to remove empty lines at the end of file

From: Marco Costalba <hidden>
Date: 2016-06-15 22:43:11

On 5/20/07, Junio C Hamano [off-list ref] wrote:
"Marco Costalba" [off-list ref] writes:
quoted
Signed-off-by: Marco Costalba <redacted>
---

This one seems to pass all the tests.
I think this happens to work because you are not feeding -u0
patch; if you have more than one context, then a hunk that ends
with + line is guaranteed to apply only at the end,  With a
diff prepared with -u0, that is not true anymore, is it?
I don't know much about this -u0 thing, could you please point me to
an example so I can try to fix also this case?

Thanks
Marco
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help