Re: [PATCH 0/5] disallow symlinks for .gitignore and .gitattributes
- From
Jeff King <peff@peff.net>
- Date
- Nov 2, 2016, 19:56 UTC
- Message-ID
- <20161102195615.3muvgr2q2lnn7sg4@sigill.intra.peff.net>
- In-Reply-To
- <CAGZ79kY195Bff5bUVm44Bx7+XzDDehYbRxgdii4s040pQXRRSQ@mail.gmail.com>
On Wed, Nov 02, 2016 at 12:46:28PM -0700, Stefan Beller wrote:
Show 11 quoted lines
> On Wed, Nov 2, 2016 at 6:04 AM, Jeff King <peff@peff.net> wrote: > > > > > 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