On Thu, Jan 21, 2021 at 4:05 PM Junio C Hamano <gitster@xxxxxxxxx> wrote: > > Phil Hord <phil.hord@xxxxxxxxx> writes: > > > diff --git builtin/branch.c builtin/branch.c > > index 8c0b428104..bcc00bcf18 100644 > > --- builtin/branch.c > > +++ builtin/branch.c > > You wasted 15 minutes of my life by choosing to deviate the list > norm of sending what "git apply -p1" (default) would accept. I am > fairly trusting type and did not suspect anybody do such an evil > thing. Why? Oof. Sorry. I forgot I have diff.noprefix=true in my local config. It is a huge timesaver for me when looking at diffs on a console since I can quickly highlight the filename with a mouse to paste into an editor. Sometimes it bites me, though. Usually I notice in the diff, but this one I was sending with format-patch / send-email. I guess I'll turn that off in git.git so I don't misfire at you again someday. Phil
