On Thu, Sep 23, 2010 at 1:13 AM, Dan McGee <[email protected]> wrote: > On Thu, Sep 23, 2010 at 1:03 AM, Dan McGee <[email protected]> wrote: >> This is an automated email from the git hooks/post-receive script. It was >> generated because a ref change was pushed to the repository containing >> the project "The official pacman repository". >> >> The branch, import-tars has been created >> at ec1fc664c9e806b1850a637336ad7c56a8931962 (commit) > > So this was a result of being curious and the questions coming up in > another thread about some old code. I imported all of the 1.X and 2.X > tarballs that we have on the FTP server into their own branch here so > we can look at the history. The real power of this comes if you do the > following: > > $ cat .git/info/grafts > ## Initial revision, based on 2.9.2 tarball > d04baabafa2ebbad92741d1f87e6ff32999f894a > 4795965caf371a55285678e5860ae66e926ebd95 > ## Commits where changes from 2.9.7 were merged in > ## <commit> <original parent> <tarball parent> > 5ef51b3e266cf43411947248886372001fdb207a > 5ef51b3e266cf43411947248886372001fdb207a > 1bcc87c3feb41dc8004c3d600e3a3501a4060b44 > 6851ce24abf07ac8bfe1406944351608ab0cfb1b > e37bc739bd704d5d0ac22d28d9f5a9334c61707e > 1bcc87c3feb41dc8004c3d600e3a3501a4060b44 > ## Commit where some changes from 2.9.8 were merged in > ## <commit> <original parent> <tarball parent> > fe0b4cccb2539165657b7f06bb0a6a1123377798 > bd25319775249fe52d6e0353c984d682d457ecc2 > ec1fc664c9e806b1850a637336ad7c56a8931962 > > Make your 'grafts' file look the same as this, and you will have our > history faked out a bit. I'm not claiming the above mappings are > perfect, but at least the first one is pretty accurate. This means you > can actually run git-blame on the "Initial revision" version of a file > and actually get results. For an example, try > > $ git blame -w d04baabafa -- scripts/makepkg > or > $ git blame -C -M -w -- scripts/makepkg.sh.in > > In either case, the history will go back into 2002. > > -Dan >
This grafts file will probably work much better, because the above one had a line indicating the parent of a commit was...itself. See the mixup with the 53f51 line. And as gmail is line wrapping all of this, All of the SHA1 lines in a given "group" should be on the same line; e.g. 2 or 3 to a line. $ cat .git/info/grafts ## Initial revision, based on 2.9.2 tarball d04baabafa2ebbad92741d1f87e6ff32999f894a 4795965caf371a55285678e5860ae66e926ebd95 ## Commits where changes from 2.9.7 were merged in ## <commit> <original parent> <tarball parent> 5ef51b3e266cf43411947248886372001fdb207a 79031ccd1a544475162facb8ca3d671f3464d1f8 1bcc87c3feb41dc8004c3d600e3a3501a4060b44 # Another 2.9.7 "merge" 6851ce24abf07ac8bfe1406944351608ab0cfb1b e37bc739bd704d5d0ac22d28d9f5a9334c61707e 1bcc87c3feb41dc8004c3d600e3a3501a4060b44 ## Commit where some changes from 2.9.8 were merged in ## <commit> <original parent> <tarball parent> fe0b4cccb2539165657b7f06bb0a6a1123377798 bd25319775249fe52d6e0353c984d682d457ecc2 ec1fc664c9e806b1850a637336ad7c56a8931962
