On Wed, May 27, 2020 at 03:56:48AM -0400, Jeff King wrote: > which does do the right thing. But: > > - all of this is in the process of being rewritten in C, so it should > probably go into add-interactive.c (it's not yet the default to use > the C version, but it probably will be soon). Trying your case with: git -c add.interactive.usebuiltin=true checkout -p master . shows that it does not list the added file at all. I suspect the form of the fix will be similar, but it may have to plumb through the file addition from the diff layer, as well. -Peff