{"thread":{"id":"31868","subject":"[DOCBUG] git subtree synopsis needs updating","startedAt":"2012-10-19T13:21:58Z","lastAt":"2013-01-19T05:48:01Z","messageCount":7,"participants":["Yann Dirson","Herman van Rink","greened@obbligato.org","Techlive Zheng"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"201553","messageId":"20121019152158.4297707b@chalon.bertin.fr","threadId":"31868","inReplyTo":null,"subject":"[DOCBUG] git subtree synopsis needs updating","fromName":"Yann Dirson","fromEmail":"dirson@bertin.fr","sentAt":"2012-10-19T13:21:58Z","receivedAt":"2012-10-19T13:21:58Z","isPatch":false,"sender":{"key":"dirson@bertin.fr","avatar":null},"body":"\nAs the examples in git-subtree.txt show, the synopsis in the same file should\nsurely get a patch along the lines of:\n\n-'git subtree' add -P \n+'git subtree' add -P \n\nFailure to specify the repository (by just specifying a local commit) fails with\nthe cryptic:\n\n warning: read-tree: emptying the index with no arguments is deprecated; use --empty\n fatal: just how do you expect me to merge 0 trees?\n\n\nFurthermore, the doc paragraph for add, aside from mentionning , also\nmentions a which the synopsis does not show either.\n\n\nAs a sidenote it someone wants to do some maintainance, using \".\" as repository when\nthe branch to subtree-add is already locally available does not work well either\n(fails with \"could not find ref myremote/myhead\").\n\n-- \nYann Dirson - Bertin Technologies\n"},{"id":"201599","messageId":"5082FE13.2000003@initfour.nl","threadId":"31868","inReplyTo":"20121019152158.4297707b@chalon.bertin.fr","subject":"Re: [DOCBUG] git subtree synopsis needs updating","fromName":"Herman van Rink","fromEmail":"rink@initfour.nl","sentAt":"2012-10-20T19:40:03Z","receivedAt":"2012-10-20T19:40:03Z","isPatch":false,"sender":{"key":"rink@initfour.nl","avatar":null},"body":"On 10/19/2012 03:21 PM, Yann Dirson wrote:\n> As the examples in git-subtree.txt show, the synopsis in the same file should\n> surely get a patch along the lines of:\n>\n> -'git subtree' add -P \n> +'git subtree' add -P \n>\n> Failure to specify the repository (by just specifying a local commit) fails with\n> the cryptic:\n>\n> warning: read-tree: emptying the index with no arguments is deprecated; use --empty\n> fatal: just how do you expect me to merge 0 trees?\n>\n>\n> Furthermore, the doc paragraph for add, aside from mentionning , also\n> mentions a which the synopsis does not show either.\n>\n>\n> As a sidenote it someone wants to do some maintainance, using \".\" as repository when\n> the branch to subtree-add is already locally available does not work well either\n> (fails with \"could not find ref myremote/myhead\").\n>\n\nThe version of subtree in contrib is rather out-dated unfortunately.\n\nI've collected a bunch of patches in\nhttps://github.com/helmo/git/tree/subtree-updates\n\nThe documentation issue is also fixed in there.\n\n-- \n\nMet vriendelijke groet / Regards,\n\nHerman van Rink\nInitfour websolutions\n"},{"id":"201809","messageId":"20121024162947.2c1edc50@chalon.bertin.fr","threadId":"31868","inReplyTo":"5082FE13.2000003@initfour.nl","subject":"Re: [DOCBUG] git subtree synopsis needs updating","fromName":"Yann Dirson","fromEmail":"dirson@bertin.fr","sentAt":"2012-10-24T14:29:47Z","receivedAt":"2012-10-24T14:29:47Z","isPatch":false,"sender":{"key":"dirson@bertin.fr","avatar":null},"body":"On Sat, 20 Oct 2012 21:40:03 +0200\nHerman van Rink wrote:\n\n> On 10/19/2012 03:21 PM, Yann Dirson wrote:\n> > As the examples in git-subtree.txt show, the synopsis in the same file should\n> > surely get a patch along the lines of:\n> >\n> > -'git subtree' add -P \n> > +'git subtree' add -P \n> >\n> > Failure to specify the repository (by just specifying a local commit) fails with\n> > the cryptic:\n> >\n> > warning: read-tree: emptying the index with no arguments is deprecated; use --empty\n> > fatal: just how do you expect me to merge 0 trees?\n> >\n> >\n> > Furthermore, the doc paragraph for add, aside from mentionning , also\n> > mentions a which the synopsis does not show either.\n> >\n> >\n> > As a sidenote it someone wants to do some maintainance, using \".\" as repository when\n> > the branch to subtree-add is already locally available does not work well either\n> > (fails with \"could not find ref myremote/myhead\").\n> >\n> \n> The version of subtree in contrib is rather out-dated unfortunately.\n> \n> I've collected a bunch of patches in\n> https://github.com/helmo/git/tree/subtree-updates\n\nAh, it's nice to see subtree updates. Any plans to get them merged anytime soon ?\n\nI guess you may want to rebase the patches from https://github.com/helmo/git-subtree,\nthe subtree-updates patch looks like a \"subtree merge --squash\" result, and is not really\nsuitable for reviewing on the list.\n\n> The documentation issue is also fixed in there.\n> \n\n\n-- \nYann Dirson - Bertin Technologies\n"},{"id":"205723","messageId":"87pq1p3c8v.fsf@waller.obbligato.org","threadId":"31868","inReplyTo":"20121024162947.2c1edc50@chalon.bertin.fr","subject":"Re: [DOCBUG] git subtree synopsis needs updating","fromName":"","fromEmail":"greened@obbligato.org","sentAt":"2013-01-01T01:47:44Z","receivedAt":"2013-01-01T01:47:44Z","isPatch":false,"sender":{"key":"greened@obbligato.org","avatar":"https://avatars.githubusercontent.com/u/5291869?v=4"},"body":"Yann Dirson writes:\n\n> Ah, it's nice to see subtree updates. Any plans to get them merged anytime soon ?\n\nAs soon as there is one patch per feature that applies cleanly to\ncontrib/ and testcases use the native git test facility.\n\nThese patches should be submitted to the mailing list for review.\n\n -David\n"},{"id":"205737","messageId":"877gnx39aa.fsf@waller.obbligato.org","threadId":"31868","inReplyTo":"20121019152158.4297707b@chalon.bertin.fr","subject":"Re: [DOCBUG] git subtree synopsis needs updating","fromName":"","fromEmail":"greened@obbligato.org","sentAt":"2013-01-01T02:51:41Z","receivedAt":"2013-01-01T02:51:41Z","isPatch":false,"sender":{"key":"greened@obbligato.org","avatar":"https://avatars.githubusercontent.com/u/5291869?v=4"},"body":"Yann Dirson writes:\n\n> As the examples in git-subtree.txt show, the synopsis in the same file should\n> surely get a patch along the lines of:\n>\n> -'git subtree' add -P \n> +'git subtree' add -P \n>\n> Failure to specify the repository (by just specifying a local commit) fails with\n> the cryptic:\n>\n> warning: read-tree: emptying the index with no arguments is deprecated; use --empty\n> fatal: just how do you expect me to merge 0 trees?\n\nSpecifying a local branch works fine, though, as does a raw commit\nhash. What do you mean by \"local commit?\"\n\nI have updated the documentation and will submit it tonight or tomorrow.\n\nAny invalid refspec should be caught early and a more useful message\nwill be displayed.\n\n> Furthermore, the doc paragraph for add, aside from mentionning , also\n> mentions a which the synopsis does not show either.\n\nFixed.\n\n> As a sidenote it someone wants to do some maintainance, using \".\" as repository when\n> the branch to subtree-add is already locally available does not work well either\n> (fails with \"could not find ref myremote/myhead\").\n\nSeems to work for me. Can you give me the command you're using when you\nsee the problem?\n\nThanks for the report!\n\n -David\n"},{"id":"207200","messageId":"20130118153734.54640b2d@chalon.bertin.fr","threadId":"31868","inReplyTo":"877gnx39aa.fsf@waller.obbligato.org","subject":"Re: [DOCBUG] git subtree synopsis needs updating","fromName":"Yann Dirson","fromEmail":"dirson@bertin.fr","sentAt":"2013-01-18T14:37:34Z","receivedAt":"2013-01-18T14:37:34Z","isPatch":false,"sender":{"key":"dirson@bertin.fr","avatar":null},"body":"On Mon, 31 Dec 2012 20:51:41 -0600\ngreened@obbligato.org wrote:\n\n> Yann Dirson writes:\n> \n> > As the examples in git-subtree.txt show, the synopsis in the same file should\n> > surely get a patch along the lines of:\n> >\n> > -'git subtree' add -P \n> > +'git subtree' add -P \n> >\n> > Failure to specify the repository (by just specifying a local commit) fails with\n> > the cryptic:\n> >\n> > warning: read-tree: emptying the index with no arguments is deprecated; use --empty\n> > fatal: just how do you expect me to merge 0 trees?\n> \n> Specifying a local branch works fine, though, as does a raw commit\n> hash. What do you mean by \"local commit?\"\n\nWith no arg documented, my understanding was that I should first \n\"git remote add\" and fetch the repo in which the branch to be added as subtree\nlived. This when running \"git subtree add\", the commit was indeed existing\nlocally.\n\n> > As a sidenote it someone wants to do some maintainance, using \".\" as repository when\n> > the branch to subtree-add is already locally available does not work well either\n> > (fails with \"could not find ref myremote/myhead\").\n> \n> Seems to work for me. Can you give me the command you're using when you\n> see the problem?\n\nHm, can't remember exactly how I reached that. But when experimenting to\nreproduce:\n\n$ contrib/subtree/git-subtree.sh add -P foo . origin/maint\ngit fetch . origin/maint\nFrom .\n * remote-tracking branch origin/maint -> FETCH_HEAD\nAdded dir 'foo'\n\n=> OK\n\n$ contrib/subtree/git-subtree.sh add -P fooo . origin/maint^0\ngit fetch . origin/maint^0\nfatal: Invalid refspec 'origin/maint^0'\n\n=> a commit is advertised, but in fact it seems to require a refspec\n\n-- \nYann Dirson - Bertin Technologies\n"},{"id":"207242","messageId":"20130119054801.GA1218@gmail.com","threadId":"31868","inReplyTo":"5082FE13.2000003@initfour.nl","subject":"Re: [DOCBUG] git subtree synopsis needs updating","fromName":"Techlive Zheng","fromEmail":"techlivezheng@gmail.com","sentAt":"2013-01-19T05:48:01Z","receivedAt":"2013-01-19T05:48:01Z","isPatch":false,"sender":{"key":"techlivezheng@gmail.com","avatar":"https://avatars.githubusercontent.com/u/816673?v=4"},"body":"On 12-10-20, Herman van Rink wrote:\n> On 10/19/2012 03:21 PM, Yann Dirson wrote:\n> > As the examples in git-subtree.txt show, the synopsis in the same file should\n> > surely get a patch along the lines of:\n> >\n> > -'git subtree' add -P \n> > +'git subtree' add -P \n> >\n> > Failure to specify the repository (by just specifying a local commit) fails with\n> > the cryptic:\n> >\n> > warning: read-tree: emptying the index with no arguments is deprecated; use --empty\n> > fatal: just how do you expect me to merge 0 trees?\n> >\n> >\n> > Furthermore, the doc paragraph for add, aside from mentionning , also\n> > mentions a which the synopsis does not show either.\n> >\n> >\n> > As a sidenote it someone wants to do some maintainance, using \".\" as repository when\n> > the branch to subtree-add is already locally available does not work well either\n> > (fails with \"could not find ref myremote/myhead\").\n> >\n> \n> The version of subtree in contrib is rather out-dated unfortunately.\nYou should really submit these patches here for reviewing, David is\nactively maintaining this tool here.\n> \n> I've collected a bunch of patches in\n> https://github.com/helmo/git/tree/subtree-updates\n> \n> The documentation issue is also fixed in there.\n> \n> -- \n> \n> Met vriendelijke groet / Regards,\n> \n> Herman van Rink\n> Initfour websolutions\n> \n> --\n> To unsubscribe from this list: send the line \"unsubscribe git\" in\n> the body of a message to majordomo@vger.kernel.org\n> More majordomo info at http://vger.kernel.org/majordomo-info.html\n"}]}