Re: [PATCH 0/2] merging renames of empty files

[Jeff King <peff@peff.net>]

On Thu, Mar 22, 2012 at 04:37:05PM -0700, Junio C Hamano wrote:

> Jeff King <peff@peff.net> writes:
> 
> > Here's a 2-patch series to replace the old 3/3 (they go on top of the
> > first two cleanups from the previous iteration).
> 
> Hrm. As this is probably useful for older maintenance track, I would have
> preferred not to see the first one that touches sequencer.c that did not
> exist in the 1.7.7.x maintenance track, as the change is purely "cosmetic"
> and does not have anything to do with fixing the over-agressive merge.

I considered that, but assumed this was not a maint fix, but rather a
new "feature" to improve the heuristics. That being said, the first
patch is entirely unrelated.  The others don't depend on it textually or
semantically, and it does not need to be part of the series (I just
happened to notice it while in the area).

> I thought that our recommendation for keeping an otherwise empty
> directories around was to have .gitignore file with two entries in it,
> namely:
> 
> 	.*
>         *
> 
> So these files will be everywhere and without being empty, no?

I dunno. I have never recommended that, but maybe it is something people
do.

> But I tend to prefer the simplicity of limiting this to empty files
> anyway.

Yeah. We might want to do a gitattributes thing on top, but I'd much
rather have this in the meantime, as it seems like it handles the bulk
of the complaints we have actually seen on the list.

-Peff