{"thread":{"id":"1257","subject":"[MERGE] Combine git-tools repository into example-tools/ subdirectory of git","startedAt":"2005-07-16T07:55:53Z","lastAt":"2005-07-16T17:19:52Z","messageCount":2,"participants":["Ryan Anderson","Linus Torvalds"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"6187","messageId":"20050716075553.GI20369@mythryan2.michonline.com","threadId":"1257","inReplyTo":null,"subject":"[MERGE] Combine git-tools repository into example-tools/ subdirectory of git","fromName":"Ryan Anderson","fromEmail":"ryan@michonline.com","sentAt":"2005-07-16T07:55:53Z","receivedAt":"2005-07-16T07:55:53Z","isPatch":false,"sender":{"key":"ryan@michonline.com","avatar":null},"body":"\nLinus, it seems, well, odd to me that you maintain two different git\ntrees.\n\nSo I used your example of the gittk merge to move git-tools into the\nmain git-repository.\n\nSummary of changes:\n1) Create an example-tools directory\n\n2) Move all of the git-tools tree, except the outdated cvs2git script\ninto this directory.\n\n3) Rename dotest to applymbox\n\n4) Minor cleanup inside applymbox of comments to apply to the new name.\n\nGiven that I don't think anyone wants to look at the diff of this, with\nall the git history involved, I have a git tree up at:\n\n\trsync://h4x0r5.com::git-ryan.git/\n\n-- \n\nRyan Anderson\n  sometimes Pug Majere\n"},{"id":"6189","messageId":"Pine.LNX.4.58.0507161015230.19183@g5.osdl.org","threadId":"1257","inReplyTo":"20050716075553.GI20369@mythryan2.michonline.com","subject":"Re: [MERGE] Combine git-tools repository into example-tools/ subdirectory of git","fromName":"Linus Torvalds","fromEmail":"torvalds@osdl.org","sentAt":"2005-07-16T17:19:52Z","receivedAt":"2005-07-16T17:19:52Z","isPatch":false,"sender":{"key":"torvalds@linux-foundation.org","avatar":"https://avatars.githubusercontent.com/u/1024025?v=4"},"body":"\n\nOn Sat, 16 Jul 2005, Ryan Anderson wrote:\n> \n> Linus, it seems, well, odd to me that you maintain two different git\n> trees.\n\nYes.\n\n> So I used your example of the gittk merge to move git-tools into the\n> main git-repository.\n\nFair enough. I was ready to pull your work, but it turns out that the old \ngit-tools repository had things like directory entries with file mode \n100775, so git-fsck-cache complains about it. I've already suppressed \ngit-fsck-cache on mode 100664 (which exists in both the kernel and git \narchives), so I could have just added the other case, but I preferred to \njust make git-convert-cache convert it, and then pull in a _converted_ \ntools archive instead.\n\n[ Side note: I'm actually happy by how git-convert-cache was still 100%\n  functional.  I haven't touched it in a long time, and it's very intimate\n  with the objects, so the fact that it still worked means that we haven't \n  screwed anything up in the object format ;]\n\nI did mostly the same things you did, except I also dropped \"stripspace\",\nsince I'd already copied it over to git (and it's now installed as\n\"git-stripspace\") earlier. And I just called the subdirectory \"tools\".\n\n\t\tLinus\n"}]}