On 12/05/2011 07:26 PM, Junio C Hamano wrote: > Michael Haggerty <mhagger@xxxxxxxxxxxx> writes: >> Now that 1.7.8 is out, I wanted to figure out the status of the >> remaining ref-api changes that are in flight, including the differences >> between between my tree and yours. > > I understand that the ultimate and largest objective of these series is to > make sure that the performance does not suffer from very many negative > lookups on the refs/replace hierarchy (which almost always is empty in a > sane repository), and I do want to see that happen. I also think it is > good that the series tries to make sure that the various codepaths we > create new refs do not let the user accidentally create refs with bad > names and/or contents. > > When we see a questionable ref that is _already_ in the respository, > however, we may warn but it is wrong to declare the repository to be > broken and refuse to work. [...] I > would want to see us get this part right and solid, and include it in > 1.7.9. > [...] > > Alternatively you _could_ swap the order of your B & C and D and try to > have your D early while giving B & C more time to cook, but I suspect the > order you chose would be better in the longer term. I will evaluate whether this is feasible. >> I understand that "next" will soon be re-rolled. Will the re-roll be >> based on the current "pu", or will you start from scratch? > > As to the two quickfix patches that are on two remaining topics from you > in my tree, I did them merely as a short-term band-aid. I was expecting, > after 1.7.8 when we eject the topics out of 'next', that they will be > rebased on top of 'master' that already contains a proper fix before these > topics started touching the same codepath. > > My reading of your summary suggests that it would be easiest to drop the > three mh/ref-api* topics from my tree, especially the 'refs: loosen > over-strict "format" check' band-aid patches, and re-queue a re-roll from > you. OK, then, I will try to re-roll the series on top of master, and build the equivalent of your quick-fix into the logical point in the series. I will also check whether it is feasible to push more of the refname sanity checks to later in the series and make them more informational where old data is concerned. How much time to I have to work on this while still leaving enough time to comfortably integrate it into 1.7.9? Michael -- Michael Haggerty mhagger@xxxxxxxxxxxx http://softwareswirl.blogspot.com/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html