Re: [PATCH] notes_merge_commit(): do not pass temporary buffer to other function
- From
Michael Haggerty <mhagger@alum.mit.edu>
- Date
- Sep 28, 2011, 02:50 UTC
- Message-ID
- <4E828B6C.1010707@alum.mit.edu>
- In-Reply-To
- <7vd3elyl8t.fsf@alter.siamese.dyndns.org>
On 09/27/2011 06:59 PM, Junio C Hamano wrote:
Show 14 quoted lines
> Michael Haggerty <mhagger@alum.mit.edu> writes: > >> I discovered this problem when an innocent modification to unrelated >> code triggered test failures. >> >> notes-merge.c | 3 ++- >> 1 files changed, 2 insertions(+), 1 deletions(-) >> >> diff --git notes-merge.c notes-merge.c >> index e1aaf43..baaf31f 100644 >> --- notes-merge.c >> +++ notes-merge.c > > It is Ok to play with -p0 yourself but please don't do that in the public.
Sorry; I had set diff.noprefix=true, not realizing that it would affect things like "git format-patch". It also confused emacs' magit mode, and probably some other tools. It's now set permanently back to false.
The reason I was experimenting with this option is that it is a quick double-click to select a filename like "foo/bar" in the diff output, whereas selecting the filename out of "a/foo/bar" requires a slower click and drag. Once I considered whether git could be taught to explicitly ignore the "[ab]/" prefix when parsing filenames, but that is too evil even for me :-)
Michael
-- Michael Haggerty mhagger@alum.mit.edu http://softwareswirl.blogspot.com/