Re: [PATCH 06/14] lockfile: introduce flag for locks outside .git

2014-12-04 Thread Jonathan Nieder
Junio C Hamano wrote: > We may want to see it done the other way around, though. That is, > to allow the pack-refs race fix, which was reviewed and has been > cooking, graduate without having to depend on this API rewrite, so > that we may be able to merge it down even to v2.2.x maintenance > tra

Re: [PATCH 06/14] lockfile: introduce flag for locks outside .git

2014-12-03 Thread Junio C Hamano
Jonathan Nieder writes: > Junio C Hamano wrote: > >> I tried to merge the 14-patch series with obvious fix-ups after >> dropping the rerere abortion change you sent separately and in >> duplicate and also dropping sb/copy-fd, but I've ran out of patience >> with this step, at least for today's in

Re: [PATCH 06/14] lockfile: introduce flag for locks outside .git

2014-12-03 Thread Jeff King
On Wed, Dec 03, 2014 at 03:29:51PM -0800, Jonathan Nieder wrote: > Junio C Hamano wrote: > > > I tried to merge the 14-patch series with obvious fix-ups after > > dropping the rerere abortion change you sent separately and in > > duplicate and also dropping sb/copy-fd, but I've ran out of patienc

Re: [PATCH 06/14] lockfile: introduce flag for locks outside .git

2014-12-03 Thread Jonathan Nieder
Junio C Hamano wrote: > I was under the impression that the purpose of the series was to > propose an API update to be used together with the remainder of the > system, not just "update code in master, breaking unstated set of > topics and leaving them behind without updating them for now". Got i

Re: [PATCH 06/14] lockfile: introduce flag for locks outside .git

2014-12-03 Thread Junio C Hamano
Junio C Hamano writes: > Jonathan Nieder writes: > >>> The 14-patch series may have been internally consistent and its >>> individual patches, when each of them was taken alone by itself, may >>> have made sense, but it appears that the aggregated whole these >>> separate topics took their root

Re: [PATCH 06/14] lockfile: introduce flag for locks outside .git

2014-12-03 Thread Junio C Hamano
Jonathan Nieder writes: >> The 14-patch series may have been internally consistent and its >> individual patches, when each of them was taken alone by itself, may >> have made sense, but it appears that the aggregated whole these >> separate topics took their root from is inconsistent with itself

Re: [PATCH 06/14] lockfile: introduce flag for locks outside .git

2014-12-03 Thread Jonathan Nieder
Junio C Hamano wrote: > I tried to merge the 14-patch series with obvious fix-ups after > dropping the rerere abortion change you sent separately and in > duplicate and also dropping sb/copy-fd, but I've ran out of patience > with this step, at least for today's integration cycle. Should we > als

Re: [PATCH 06/14] lockfile: introduce flag for locks outside .git

2014-12-03 Thread Junio C Hamano
Junio C Hamano writes: > Jonathan Nieder writes: > >> diff --git a/refs.c b/refs.c >> index 917f8fc..39e43cf 100644 >> --- a/refs.c >> +++ b/refs.c >> @@ -2326,7 +2326,7 @@ static struct ref_lock *lock_ref_sha1_basic(const char >> *refname, >> */ >> go

Re: [PATCH 06/14] lockfile: introduce flag for locks outside .git

2014-12-03 Thread Jonathan Nieder
Junio C Hamano wrote: > Jonathan Nieder writes: >> diff --git a/refs.c b/refs.c >> index 917f8fc..39e43cf 100644 >> --- a/refs.c >> +++ b/refs.c >> @@ -2326,7 +2326,7 @@ static struct ref_lock *lock_ref_sha1_basic(const char >> *refname, >> */ >> goto r

Re: [PATCH 06/14] lockfile: introduce flag for locks outside .git

2014-12-03 Thread Junio C Hamano
Jonathan Nieder writes: > diff --git a/refs.c b/refs.c > index 917f8fc..39e43cf 100644 > --- a/refs.c > +++ b/refs.c > @@ -2326,7 +2326,7 @@ static struct ref_lock *lock_ref_sha1_basic(const char > *refname, >*/ > goto retry; > else > -