{"thread":{"id":"19179","subject":"still getting 'It is a submodule!\" in 1.6.2.5","startedAt":"2009-05-04T20:39:35Z","lastAt":"2009-05-06T09:57:46Z","messageCount":6,"participants":["Tim Olsen","Junio C Hamano","Matthias Andree"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"113003","messageId":"gtnjq8$317$1@ger.gmane.org","threadId":"19179","inReplyTo":null,"subject":"still getting 'It is a submodule!\" in 1.6.2.5","fromName":"Tim Olsen","fromEmail":"tim@brooklynpenguin.com","sentAt":"2009-05-04T20:39:35Z","receivedAt":"2009-05-04T20:39:35Z","isPatch":false,"sender":{"key":"tim@brooklynpenguin.com","avatar":"https://gravatar.com/avatar/a468fd97b6433c4d22252ca75017d30a55046f5715e67b83e62b00a0833deb22?d=mp&s=160"},"body":"Hello. I reported a bug last week [1] with regard to merging a\nrepository that contains submodules. To summarize the bug, I was\ngetting the following error message from git-merge:\n\nfatal: cannot read object 83055ffdddde60d41d9811aae77e78be50b329f8\n'rubydav': It is a submodule!\n\nwhen rubydav was never not a submodule.\n\nClemens replied with a patch [2], but I don't think it got into git's git.\n\nJunio replied with two versions of a patch [3, 4], of which one of them\nappears to have made it into git's git as commit\n7dae8b21c2fe39a59661c709f0dc17090dafa5a4\n\n1.6.2.5 was then released yesterday which has commit\n7dae8b21c2fe39a59661c709f0dc17090dafa5a4.\n\nSo I tried out 1.6.2.5 but I got the same error :-(\n\nTo help others reproduce the bug, I have made a clone of our git\nrepository publicly available. Here are the steps to reproduce the error:\n\n~/git$ git clone git://nolita.limebits.net/limebits-merge-bug\n~/git$ cd limebits-merge-bug/\n~/git/limebits-merge-bug$ git branch --track 0.15.x origin/0.15.x\nBranch 0.15.x set up to track remote branch refs/remotes/origin/0.15.x.\n~/git/limebits-merge-bug$ git checkout 0.15.x\nSwitched to branch '0.15.x'\n~/git/limebits-merge-bug$ git merge origin/bits-tiddlywiki-01\nfatal: cannot read object ef0b013adc08cb28a35e790088e55df3fb2d7b15\n'server': It is a submodule!\n~/git/limebits-merge-bug$\n\nAgain, 'server' has never been anything but a submodule.\n\nThanks for the help!\n\nTim\n\n\n[1] http://marc.info/?l=git&m=124094048321413&w=2\n[2] http://marc.info/?l=git&m=124099458427695&w=2\n[3] http://marc.info/?l=git&m=124103124319607&w=2\n[4] http://marc.info/?l=git&m=124103686729847&w=2\n"},{"id":"113022","messageId":"7vy6tc2gnt.fsf@alter.siamese.dyndns.org","threadId":"19179","inReplyTo":"gtnjq8$317$1@ger.gmane.org","subject":"Re: still getting 'It is a submodule!\" in 1.6.2.5","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-05-05T06:43:50Z","receivedAt":"2009-05-05T06:43:50Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Tim Olsen writes:\n\n> Clemens replied with a patch [2], but I don't think it got into git's git.\n>\n> Junio replied with two versions of a patch [3, 4], of which one of them\n> appears to have made it into git's git as commit\n> 7dae8b21c2fe39a59661c709f0dc17090dafa5a4\n>\n> 1.6.2.5 was then released yesterday which has commit\n> 7dae8b21c2fe39a59661c709f0dc17090dafa5a4.\n\nBut that is not the one you want. 7dae8b2 (diff -c -p: do not die on\nsubmodules, 2009-04-29) is to allow viewing of such a merge correctly; To\nmake the merge automatically, you'd need 0c44c94 (merge-recursive: do not\ndie on a conflicting submodule, 2009-04-29), which is on 'master', but not\non 1.6.2.X (and likely will never be).\n\nCould you be running 1.6.3-rcX instead of 1.6.2.X? In general, the tip of\nthe 'master' is always as stable as any released version, if not more.\n"},{"id":"113040","messageId":"4A004BCA.5070709@brooklynpenguin.com","threadId":"19179","inReplyTo":"7vy6tc2gnt.fsf@alter.siamese.dyndns.org","subject":"Re: still getting 'It is a submodule!\" in 1.6.2.5","fromName":"Tim Olsen","fromEmail":"tim@brooklynpenguin.com","sentAt":"2009-05-05T14:23:06Z","receivedAt":"2009-05-05T14:23:06Z","isPatch":false,"sender":{"key":"tim@brooklynpenguin.com","avatar":"https://gravatar.com/avatar/a468fd97b6433c4d22252ca75017d30a55046f5715e67b83e62b00a0833deb22?d=mp&s=160"},"body":"Junio C Hamano wrote:\n> But that is not the one you want. 7dae8b2 (diff -c -p: do not die on\n> submodules, 2009-04-29) is to allow viewing of such a merge correctly; To\n> make the merge automatically, you'd need 0c44c94 (merge-recursive: do not\n> die on a conflicting submodule, 2009-04-29), which is on 'master', but not\n> on 1.6.2.X (and likely will never be).\n> \n> Could you be running 1.6.3-rcX instead of 1.6.2.X? In general, the tip of\n> the 'master' is always as stable as any released version, if not more.\n\nThanks Junio for your reply. We have made a copy of the offending\nbranch by hand and have managed to merge that instead for now. I can\nwait until 1.6.3 is released.\n\nThanks again for your help!\n\nTim\n"},{"id":"113042","messageId":"4A005A06.6040209@brooklynpenguin.com","threadId":"19179","inReplyTo":"4A004BCA.5070709@brooklynpenguin.com","subject":"Re: still getting 'It is a submodule!\" in 1.6.2.5","fromName":"Tim Olsen","fromEmail":"tim@brooklynpenguin.com","sentAt":"2009-05-05T15:23:50Z","receivedAt":"2009-05-05T15:23:50Z","isPatch":false,"sender":{"key":"tim@brooklynpenguin.com","avatar":"https://gravatar.com/avatar/a468fd97b6433c4d22252ca75017d30a55046f5715e67b83e62b00a0833deb22?d=mp&s=160"},"body":"Tim Olsen wrote:\n> Thanks Junio for your reply. We have made a copy of the offending\n> branch by hand and have managed to merge that instead for now. I can\n> wait until 1.6.3 is released.\n\nI changed my mind and decided to try out 1.6.3.rc4. I can confirm that\nthe bug is fixed. Thanks!\n\nTim\n\n______________________________________________________________________\nThis email has been scanned by the MessageLabs Email Security System.\nFor more information please visit http://www.messagelabs.com/email \n______________________________________________________________________\n"},{"id":"113071","messageId":"op.uthy6h131e62zd@merlin.emma.line.org","threadId":"19179","inReplyTo":"7vy6tc2gnt.fsf@alter.siamese.dyndns.org","subject":"Re: still getting 'It is a submodule!\" in 1.6.2.5","fromName":"Matthias Andree","fromEmail":"matthias.andree@gmx.de","sentAt":"2009-05-06T07:31:19Z","receivedAt":"2009-05-06T07:31:19Z","isPatch":false,"sender":{"key":"matthias.andree@gmx.de","avatar":null},"body":"Am 05.05.2009, 08:43 Uhr, schrieb Junio C Hamano :\n\n> Tim Olsen writes:\n>\n>> Clemens replied with a patch [2], but I don't think it got into git's \n>> git.\n>>\n>> Junio replied with two versions of a patch [3, 4], of which one of them\n>> appears to have made it into git's git as commit\n>> 7dae8b21c2fe39a59661c709f0dc17090dafa5a4\n>>\n>> 1.6.2.5 was then released yesterday which has commit\n>> 7dae8b21c2fe39a59661c709f0dc17090dafa5a4.\n>\n> But that is not the one you want. 7dae8b2 (diff -c -p: do not die on\n> submodules, 2009-04-29) is to allow viewing of such a merge correctly; To\n> make the merge automatically, you'd need 0c44c94 (merge-recursive: do not\n> die on a conflicting submodule, 2009-04-29), which is on 'master', but \n> not\n> on 1.6.2.X (and likely will never be).\n>\n> Could you be running 1.6.3-rcX instead of 1.6.2.X? In general, the tip \n> of\n> the 'master' is always as stable as any released version, if not more.\n\nIs there an easy-to-find and easy-to-grasp table that lists which branches \nare recommended for which target group? If there is, I have constantly \nmissed it.\n\nMay I suggest that there be a remark on the download page of git-scm.com \nthat \"master\" is really the recommended branch?\n\n-- \nMatthias Andree\n"},{"id":"113077","messageId":"op.uth5yiis1e62zd@balu","threadId":"19179","inReplyTo":"20090506180925.6117@nanako3.lavabit.com","subject":"Re: still getting 'It is a submodule!\" in 1.6.2.5","fromName":"Matthias Andree","fromEmail":"matthias.andree@gmx.de","sentAt":"2009-05-06T09:57:46Z","receivedAt":"2009-05-06T09:57:46Z","isPatch":false,"sender":{"key":"matthias.andree@gmx.de","avatar":null},"body":"Am 06.05.2009, 11:09 Uhr, schrieb Nanako Shiraishi :\n\n> Quoting \"Matthias Andree\" writes:\n>\n>> Is there an easy-to-find and easy-to-grasp table that lists which\n>> branches are recommended for which target group? If there is, I have\n>> constantly missed it.\n>\n> After each major release Junio sends out a message with a title \"Note \n> from the maintainer\" (or sth like that).\n\nOK.\n\n>> May I suggest that there be a remark on the download page of\n>> git-scm.com that \"master\" is really the recommended branch?\n>\n> I'm afraid you are suggesting to a wrong person; Junio doesn't control \n> what's in that domain.\n\nThis was in the hopes that the site maintainer was reading this list, and \ngiven there's a redirection from git.or.cz to the new site, I deemed it \nwas somehow semi-official. At least, git-scm.com is concise :-)\n\n-- \nMatthias Andree\n"}]}