From: Oliver Joseph Ash <oliverjash@gmail.com>
To: phillip.wood@talktalk.net
Cc: git@vger.kernel.org, gitster@pobox.com, martin.agren@gmail.com,
mqudsi@neosmart.net, oliverjash@gmail.com,
phillip.wood@dunelm.org.uk
Subject: Re: Regression in patch add?
Date: Thu, 10 May 2018 15:11:25 +0100 [thread overview]
Message-ID: <20180510141125.21677-1-oliverjash@gmail.com> (raw)
In-Reply-To: <be321106-2f10-e678-8237-449d2dd30fee@talktalk.net>
You found the problem Phillip! My editor was trimming trailing white space, which breaks the context line.
I had tried to use an alternative editor to account for any editor specific behaviour, but it turns out both the editors I tested in were doing this!
I suspect this change in behaviour will effect a lot of users? If so, it would be good if `git add -p` allowed for this behaviour, in the same way `git apply` does.
Meanwhile, I can easily configure my editor not to do this for `*.diff` files.
Thanks for your help, Phillip and Martin!
Mahmoud, does this also explain your problem as per your original post?
next prev parent reply other threads:[~2018-05-10 14:11 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-15 12:21 Regression in patch add? mqudsi
2018-04-15 13:59 ` Martin Ågren
2018-04-16 10:01 ` Phillip Wood
2018-04-16 10:00 ` Phillip Wood
2018-05-10 10:41 ` Oliver Joseph Ash
2018-05-10 12:17 ` Martin Ågren
2018-05-10 13:16 ` Oliver Joseph Ash
2018-05-10 13:54 ` Martin Ågren
2018-05-10 13:49 ` Phillip Wood
2018-05-10 14:11 ` Oliver Joseph Ash [this message]
2018-05-10 17:58 ` Phillip Wood
2018-05-11 2:47 ` Junio C Hamano
2018-05-11 18:23 ` Phillip Wood
2018-05-10 13:15 ` Oliver Joseph Ash
2018-06-01 17:46 ` [PATCH] add -p: fix counting empty context lines in edited patches Phillip Wood
2018-06-01 19:07 ` Jacob Keller
2018-06-01 20:03 ` Eric Sunshine
2018-06-04 10:08 ` Phillip Wood
2018-06-04 17:21 ` Eric Sunshine
2018-06-11 9:46 ` [PATCH v2] " Phillip Wood
2018-07-11 20:27 ` Jeff Felchner
2018-07-11 20:50 ` Junio C Hamano
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=20180510141125.21677-1-oliverjash@gmail.com \
--to=oliverjash@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=martin.agren@gmail.com \
--cc=mqudsi@neosmart.net \
--cc=phillip.wood@dunelm.org.uk \
--cc=phillip.wood@talktalk.net \
/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).