Nicolas Pitre <nico@xxxxxxx> wrote: > On Wed, 1 Oct 2008, Shawn O. Pearce wrote: > > Jeff King <peff@xxxxxxxx> wrote: > > > On Wed, Oct 01, 2008 at 08:54:58AM -0700, Shawn O. Pearce wrote: > > > > > > > I think its easy enough to just rename our SHA_CTX and SHA_* > > > > functions to something more git specific. Since its mostly a global > > > > > > I think that is the cleanest and simplest solution. As for merging pain, > > > I think Junio would generally do a mechanical change like this as the > > > first thing after a release. However, in this case, I think we might > > > want it sooner if the conflict is causing breakage. > > > > Oh, yea, that's probably true. But with ARM broken according to > > Nico I'd almost just want this fixed in the upcoming 1.6.1 release. > > > Its simple enough to do. We can even do something like this during > > the transition period until right before the 1.6.1 final: > > Because it's easy to do then I'd do it sooner than later. Nico, are you going to write a patch for this? If not I'll do it myself later today or tomorrow morning. I don't mind doing it, I just don't want to duplicate work with you. I've got too much else going on to waste my time that way. Of course I'm wasting time on this email... ;-) -- Shawn. -- 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
