On Wed, Sep 10, 2008 at 12:56:03AM +0200, Stephen R. van den Berg wrote: > The only way to perform the backports is by using cherry-pick. > The history of each backport *is* important though. > Since all the developers who care about the multiple release branches > have all the relevant branches in their repository, the presence of > a origin object is by no means random, it's a certainty. Recording cherry-picks in your workflow certainly makes sense, but I'm not talking about workflow-level issues here. You are adding an extra header to the commit object. I'm talking about the object database and low-level Git model implications this has. In other way, I think this is purely a porcelain matter and recording this information in the free-form area is more than enough. > >Why do you actually *follow* the origin link at all anyway? Without its > >parents, the associated tree etc., the object is essentially useless for > >you; the authorship information and commit message should've been > >preserved by a proper cherry-pick anyway. You're cluttering the object > >store with invalid objects, which also breaks quite some fundamental > >logic within Git (which assumes that if an object exists, all its > >references are valid - give or take few special cases like shallow > >repositories, but this would have very different characteristics). > > I'd prefer to formalise the (weak) relationship of an origin link, instead of > relying on vague assumptions when parsing the free-form commit message > and then guessing what the mentioned hash might mean. Why? > >Having history browsers draw fancy lines is fine but I see nothing wrong > >with them extracting this from the free-form part of the commit message. > >For informative purposes, we don't shy away from heuristics anyway, c.f. > >our renames detection (heck, we are even brave enough to use that for > >merges). > > It's not just that. If I make a change to an area that was cherrypicked > from another branch, then I find it rather important to check if any > changes to this area need to be backported/forwardported to the branches > the origin links are pointing to. > I.e. the origin link allows me to improve my efficiency as a programmer. And why are the notes created by git cherry-pick -x insufficient for that? -- Petr "Pasky" Baudis The next generation of interesting software will be done on the Macintosh, not the IBM PC. -- Bill Gates -- 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
