From: Phillip Wood <phillip.wood@talktalk.net>
To: "Martin Ågren" <martin.agren@gmail.com>, mqudsi@neosmart.net
Cc: Git Mailing List <git@vger.kernel.org>,
Phillip Wood <phillip.wood@dunelm.org.uk>
Subject: Re: Regression in patch add?
Date: Mon, 16 Apr 2018 11:01:58 +0100 [thread overview]
Message-ID: <aa2599d6-6349-0c98-6a31-f68c8b8bf0f8@talktalk.net> (raw)
In-Reply-To: <CAN0heSqCZWR1OD4k+-_OBdtCjCNW-UexLo4P-C5XyBqfU6KBEA@mail.gmail.com>
On 15/04/18 14:59, Martin Ågren wrote:
> Hi Mahmoud
>
> On 15 April 2018 at 14:21, <mqudsi@neosmart.net> wrote:
>> I first run `git add -p`, then manually edit a chunk (after hitting `s`
>> once, if it matters). The chunk originally contains the following:
>
> [...]
>
>> Under git 2.7.4, I can edit it to the following, which is accepted
>> without a problem:
>>
>> ```diff
>> # Manual hunk edit mode -- see bottom for a quick guide
>> @@ -20,7 +20,7 @@
>> "call dein#add('Shougo/dein.vim', {'rev': 'master'})
>>
>> " Add or remove your plugins here:
>> - " call dein#add('flazz/vim-colorschemes')
>> - call dein#add('Haron-Prime/evening_vim')
>> + call dein#add('flazz/vim-colorschemes')
>> + call dein#add('Haron-Prime/evening_vim')
>>
>> "core plugins that change the behavior of vim and how we use it globally
>> ```
>>
>> All I did here was remove one `+` line and manually add another (which
>> is a variant of the second `-` line).
>
> So the line is identical (sans s/^-/+/). Interesting.
>
>> Under git 2.17.0.252.gfe0a9ea, the same piece is opened in $VISUAL for
>> editing (and if left unmodified applies OK), but when modified in the
>> to the same exact value, after exiting the editor I receive the
>> following error from git:
>>
>> error: patch fragment without header at line 15: @@ -25,7 +25,8 @@
>
> I can't seem to reproduce this with some very simple testing. Are you
> able to share your files? Or even better, derive a minimal reproduction
> recipe?
>
> What happens if you do not do a "remove this line, then add it again",
> but instead turn that unchanged line into context? That is, you edit the
> hunk into something like this (but without white-space damage):
>
> ...
> - " call dein#add('flazz/vim-colorschemes')
> + call dein#add('flazz/vim-colorschemes')
> call dein#add('Haron-Prime/evening_vim')
> ...
That's a good idea to try
> Adding Phillip to cc, since he was recently working in this area
Thanks for cc-ing me
> and might have an idea.
I wish I did!
Best Wishes
Phillip
>
> Martin
>
next prev parent reply other threads:[~2018-04-16 10:02 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 [this message]
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
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=aa2599d6-6349-0c98-6a31-f68c8b8bf0f8@talktalk.net \
--to=phillip.wood@talktalk.net \
--cc=git@vger.kernel.org \
--cc=martin.agren@gmail.com \
--cc=mqudsi@neosmart.net \
--cc=phillip.wood@dunelm.org.uk \
/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).