Re: [PATCH 0/5] disallow symlinks for .gitignore and .gitattributes

On Wed, Nov 02, 2016 at 12:46:28PM -0700, Stefan Beller wrote:

On Wed, Nov 2, 2016 at 6:04 AM, Jeff King [off-list ref] wrote:

quoted

 attr.c                | 58 ++++++++++++++++++++++++++++++++-------------------

$ git diff --stat origin/master..origin/sb/attr  |grep attr.c
 attr.c                                             |  531 +-

From a cursory read of your series this may result in a merge
conflict, but would be
easily fixable (changed signature of functions that clash).

Yeah, I knew you guys were doing some refactoring of the attribute code
elsewhere, but hadn't actually seen how bad the damage was. I just did
the merge with sb/attr, though, and the conflicts are quite trivial
(mostly s/1/flags/ in bootstrap_attr_stack()).

I'm happy to re-roll on a different base if sb/attr graduates first, but
I suspect Junio can just resolve the conflicts at merge time.

-Peff