{"thread":{"id":"30058","subject":"git-subtree Next Round Ready","startedAt":"2012-03-25T22:06:06Z","lastAt":"2012-04-10T18:12:02Z","messageCount":6,"participants":["greened@obbligato.org","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"187694","messageId":"87398we3ox.fsf@smith.obbligato.org","threadId":"30058","inReplyTo":null,"subject":"git-subtree Next Round Ready","fromName":"","fromEmail":"greened@obbligato.org","sentAt":"2012-03-25T22:06:06Z","receivedAt":"2012-03-25T22:06:06Z","isPatch":false,"sender":{"key":"greened@obbligato.org","avatar":"https://avatars.githubusercontent.com/u/5291869?v=4"},"body":"Ok, I've cleaned things up with git-subtree so the changes I had to the\ntest infrastructure are gone. No changes to upstream are needed to\nsupport git-subtree in contrib/ now.\n\nAs usual, the branches are here:\n\ngit://sources.obbligato.org/git/git.git\n\ngitweb here: http://sources.obbligato.org/?p=git.git;a=summary\n\nThere are three branches. master is the usual. \"subtree-latest\" is my\nversion of git-subtree cleaned up for upstreaming into contrib/. This\nis the pure git-subtree history, ready to be subtree merged.\n\"subtree-integrated\" is a version of upstream git.git with\nsubtree-latest merged as a subtree (done via git-subtree!).\n\nI assume it will be easier to have Junio or another integrator do the\nsubtree merge from subtree-latest in his or her workarea but I provide\nsubtree-integrated so everyone can easily check out what it will look\nlike.\n\nLet me know of anything else you need.\n\nThanks!\n\n -Dave\n"},{"id":"188020","messageId":"7vobrgs5tb.fsf@alter.siamese.dyndns.org","threadId":"30058","inReplyTo":"87398we3ox.fsf@smith.obbligato.org","subject":"Re: git-subtree Next Round Ready","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-03-28T22:45:36Z","receivedAt":"2012-03-28T22:45:36Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"greened@obbligato.org writes:\n\n> There are three branches. master is the usual. \"subtree-latest\" is my\n> version of git-subtree cleaned up for upstreaming into contrib/. This\n> is the pure git-subtree history, ready to be subtree merged.\n> \"subtree-integrated\" is a version of upstream git.git with\n> subtree-latest merged as a subtree (done via git-subtree!).\n\nI do not see the point of your subtree branch, especially after 1f30551\n(Set TEST_DIRECTORY, 2012-03-20) where it starts depending on files\noutside its top-level directory. At that point, the tree ceases to be\nviable as a standalone project.\n\nI think it would make more sense, from the history viewpoint, to:\n\n - Stop the history of the \"subtree\" branch at commit d3a04e0 (Use Test\n Harness, 2012-01-29);\n\n - Create \"for-upstream\" branch that is a fork of 1.7.10 (when tagged);\n\n - On \"for-upstream\" branch, add all the files from d3a04e0 (Use Test\n Harness, 2012-01-29) to contrib/subtree, and record it as a merge\n between 1.7.10 and d3a04e0 (you can use subtree merge for this); and\n finally\n\n - Replay the commits between d3a04e0 and the tip of your current\n \"subtree\" branch on top of \"for-upstream\".\n\nAnd then have me pull the \"for-upstream\" branch.\n\nFurther development after that point can continue in-tree just like any\nother contrib subsystems like \"completion/\" and \"fast-import/git-p4\".\n"},{"id":"188278","messageId":"87mx6v49id.fsf@smith.obbligato.org","threadId":"30058","inReplyTo":"7vobrgs5tb.fsf@alter.siamese.dyndns.org","subject":"Re: git-subtree Next Round Ready","fromName":"","fromEmail":"greened@obbligato.org","sentAt":"2012-04-01T18:00:58Z","receivedAt":"2012-04-01T18:00:58Z","isPatch":false,"sender":{"key":"greened@obbligato.org","avatar":"https://avatars.githubusercontent.com/u/5291869?v=4"},"body":"Junio C Hamano writes:\n\n> I do not see the point of your subtree branch, especially after 1f30551\n> (Set TEST_DIRECTORY, 2012-03-20) where it starts depending on files\n> outside its top-level directory. At that point, the tree ceases to be\n> viable as a standalone project.\n\nThe point of the branch was to provide an easy reference to subtree\nmerge into the main git repository. I have no intention of keeping a\nseparate git-subtree project.\n\n> I think it would make more sense, from the history viewpoint, to:\n>\n> - Stop the history of the \"subtree\" branch at commit d3a04e0 (Use Test\n> Harness, 2012-01-29);\n>\n> - Create \"for-upstream\" branch that is a fork of 1.7.10 (when tagged);\n>\n> - On \"for-upstream\" branch, add all the files from d3a04e0 (Use Test\n> Harness, 2012-01-29) to contrib/subtree, and record it as a merge\n> between 1.7.10 and d3a04e0 (you can use subtree merge for this); and\n> finally\n>\n> - Replay the commits between d3a04e0 and the tip of your current\n> \"subtree\" branch on top of \"for-upstream\".\n>\n> And then have me pull the \"for-upstream\" branch.\n\nOk, that sounds fine to me.\n\n> Further development after that point can continue in-tree just like any\n> other contrib subsystems like \"completion/\" and \"fast-import/git-p4\".\n\nYep, sounds good!\n\n -Dave\n"},{"id":"188835","messageId":"87bon01cpx.fsf@smith.obbligato.org","threadId":"30058","inReplyTo":"7vobrgs5tb.fsf@alter.siamese.dyndns.org","subject":"Re: git-subtree Next Round Ready","fromName":"","fromEmail":"greened@obbligato.org","sentAt":"2012-04-10T03:34:50Z","receivedAt":"2012-04-10T03:34:50Z","isPatch":false,"sender":{"key":"greened@obbligato.org","avatar":"https://avatars.githubusercontent.com/u/5291869?v=4"},"body":"Junio C Hamano writes:\n\n> I think it would make more sense, from the history viewpoint, to:\n>\n> - Stop the history of the \"subtree\" branch at commit d3a04e0 (Use Test\n> Harness, 2012-01-29);\n>\n> - Create \"for-upstream\" branch that is a fork of 1.7.10 (when tagged);\n>\n> - On \"for-upstream\" branch, add all the files from d3a04e0 (Use Test\n> Harness, 2012-01-29) to contrib/subtree, and record it as a merge\n> between 1.7.10 and d3a04e0 (you can use subtree merge for this); and\n> finally\n>\n> - Replay the commits between d3a04e0 and the tip of your current\n> \"subtree\" branch on top of \"for-upstream\".\n\nAll right, this should be ready to go.\n\ngit clone git://sources.obbligato.org/git/git.git\n\nBranch is \"for-upstream.\"\n\nAlso accessible via gitweb.\n\n -Dave\n"},{"id":"188882","messageId":"7vmx6jqzug.fsf@alter.siamese.dyndns.org","threadId":"30058","inReplyTo":"87bon01cpx.fsf@smith.obbligato.org","subject":"Re: git-subtree Next Round Ready","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-04-10T16:02:02Z","receivedAt":"2012-04-10T16:02:02Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"greened@obbligato.org writes:\n\n> All right, this should be ready to go.\n>\n> git clone git://sources.obbligato.org/git/git.git\n>\n> Branch is \"for-upstream.\"\n\nI'll pull this directly to 'master' as this touches nothing outside\ncontrib/subtree/ directory.\n\nIf this will eventually become part of git-core, the default set for\n$(prefix) in contrib/subtree/Makefile may want to watch what we set in the\ntoplevel Makefile, but minor things like that can be tweaked in-tree.\n\nThanks.\n"},{"id":"188893","messageId":"87hawrqwwd.fsf@waller.obbligato.org","threadId":"30058","inReplyTo":"7vmx6jqzug.fsf@alter.siamese.dyndns.org","subject":"Re: git-subtree Next Round Ready","fromName":"","fromEmail":"greened@obbligato.org","sentAt":"2012-04-10T18:12:02Z","receivedAt":"2012-04-10T18:12:02Z","isPatch":false,"sender":{"key":"greened@obbligato.org","avatar":"https://avatars.githubusercontent.com/u/5291869?v=4"},"body":"Junio C Hamano writes:\n\n> I'll pull this directly to 'master' as this touches nothing outside\n> contrib/subtree/ directory.\n\nThanks!\n\n> If this will eventually become part of git-core, the default set for\n> $(prefix) in contrib/subtree/Makefile may want to watch what we set in the\n> toplevel Makefile, but minor things like that can be tweaked in-tree.\n\nYeah, I thought about that but I didn't know the best way to grab the\ndefault from the Makefile.\n\nIt should be easy to move this to git-core. The top-level Makefile\nshould just work when the files are moved out of contrib.\n\nThanks for integrating this. Then I can look at Herman's changes and\nthen maybe we can talk about what we need to do to move this to\ngit-core.\n\n -Dave\n"}]}