Re: git add intent-to-add then git add patch no longer allows edit

From: Phillip Wood <phillip.wood123@gmail.com>
Date: Aug 24, 2020, 17:28 UTC
Message-ID: <fe21c773-341c-d029-077c-00daeb6014f7@gmail.com>
In-Reply-To: <C55D662I6OBC.4J2O3KP58DJ2@ziyou.local>

Hi Raymond

On 24/08/2020 17:23, Raymond E. Pasco wrote:

Show 10 quoted lines

> On Sun Aug 23, 2020 at 12:03 PM EDT, Phillip Wood wrote:
>> I think I was talking about edit rather than split. I'd forgotten that
>> it used to work with i-t-a additions. I just checked seen and it seems
>> to be working again since dscho's patch although the user is presented
>> with the full diff header rather than just a hunk header in the editor.
>> As you say once the user has staged some part of the diff the rest falls
>> out naturally.
> 
> Which topic is this? I can't find one where it works (it's always
> "Sorry, cannot edit this hunk" on seen 2.28.0.508.g7d1bebc7fe).

The patch I was referring to is 2c8bd8471a ("checkout -p: handle new files correctly", 2020-05-27)

I tested seen at 3981657b13 ("Merge branch 'rp/apply-cached-doc' into seen", 2020-08-21). I was using the C version of 'add -p' which is opt-in at the moment by setting add.interactive.usebuiltin=true in your config (or with git -c). I hope that helps, I'm going off line now for 10-14 days

Best Wishes

Phillip

Show 6 quoted lines

> Yeah, it's split that would be a problem, edit just stages and moves on.
> Split would be nice, but I don't actually recall it ever working before
> - it doesn't work now on diffs from actual blank files. Getting edit
> back (if there's a topic that does this already) makes it work for my
> usage.
>