{"thread":{"id":"17068","subject":"git submodule merge madness","startedAt":"2009-01-09T21:50:50Z","lastAt":"2009-01-15T00:36:24Z","messageCount":7,"participants":["Ask Bjørn Hansen","Andreas Ericsson","Johannes Schindelin","Sverre Rabbelier"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"99821","messageId":"ADC7A3B1-6756-4258-93CD-DB40C7D2793C@develooper.com","threadId":"17068","inReplyTo":null,"subject":"git submodule merge madness","fromName":"Ask Bjørn Hansen","fromEmail":"ask@develooper.com","sentAt":"2009-01-09T21:50:50Z","receivedAt":"2009-01-09T21:50:50Z","isPatch":false,"sender":{"key":"ask@develooper.com","avatar":"https://gravatar.com/avatar/05ce68433216df7d04bb0d82b7d93b11957e2137e6ed23c4b5bc061d78635f2f?d=mp&s=160"},"body":"Hi,\n\nWe've (again) replaced a few directories with submodules. Man, it's \nmadness!\n\nThe typical problem is that we get an error trying to merge a \"pre- \nsubmodule\" branch into master:\n\n\tfatal: cannot read object 894c77319a18c4d48119c2985a9275c9f5883584 \n'some/sub/dir': It is a submodule!\nMark Levedahl wrote an example in July, but I don't think he got any \nreplies: http://marc.info/?l=git&m=121587851313303\nAny ideas? Is there something we can do? I see a strong \ncorrelation between adding a new submodule and the number of \"git \nsucks\" messages on our internal IRC server.\n\n\n - ask\n\n-- \nhttp://develooper.com/ - http://askask.com/\n"},{"id":"99834","messageId":"F01C5A5A-1FA3-42EC-BEE7-46A6C0E7C5DF@develooper.com","threadId":"17068","inReplyTo":"ADC7A3B1-6756-4258-93CD-DB40C7D2793C@develooper.com","subject":"Re: git submodule merge madness","fromName":"Ask Bjørn Hansen","fromEmail":"ask@develooper.com","sentAt":"2009-01-10T01:13:59Z","receivedAt":"2009-01-10T01:13:59Z","isPatch":false,"sender":{"key":"ask@develooper.com","avatar":"https://gravatar.com/avatar/05ce68433216df7d04bb0d82b7d93b11957e2137e6ed23c4b5bc061d78635f2f?d=mp&s=160"},"body":"\nOn Jan 9, 2009, at 1:50 PM, Ask Bjørn Hansen wrote:\n\n> The typical problem is that we get an error trying to merge a \"pre- \n> submodule\" branch into master:\n>\n> \tfatal: cannot read object 894c77319a18c4d48119c2985a9275c9f5883584 \n> 'some/sub/dir': It is a submodule!\n>\n> Mark Levedahl wrote an example in July, but I don't think he got any \n> replies: http://marc.info/?l=git&m=121587851313303\n\nReplying to myself for the archives:\n\nLooking in the code I noticed it's the recursive merge algorithm \ngiving that error. Making it use the resolve strategy (\"git merge -s \nresolve\") made it work in the cases I had today, yay.\n\n - ask\n\n-- \nhttp://develooper.com/ - http://askask.com/\n"},{"id":"100120","messageId":"496B4534.9020809@op5.se","threadId":"17068","inReplyTo":"ADC7A3B1-6756-4258-93CD-DB40C7D2793C@develooper.com","subject":"Re: git submodule merge madness","fromName":"Andreas Ericsson","fromEmail":"ae@op5.se","sentAt":"2009-01-12T13:27:16Z","receivedAt":"2009-01-12T13:27:16Z","isPatch":false,"sender":{"key":"ae@op5.se","avatar":"https://gravatar.com/avatar/426e89595c75a8f5252dd0c989e5fabe5bcac616e68557427ad9aef6b0ca342a?d=mp&s=160"},"body":"Ask Bjørn Hansen wrote:\n> Hi,\n> \n> We've (again) replaced a few directories with submodules. Man, it's \n> madness!\n> \n> The typical problem is that we get an error trying to merge a \n> \"pre-submodule\" branch into master:\n> \n> fatal: cannot read object 894c77319a18c4d48119c2985a9275c9f5883584 \n> 'some/sub/dir': It is a submodule!\n> Mark Levedahl wrote an example in July, but I don't think he got any \n> replies: http://marc.info/?l=git&m=121587851313303\n> Any ideas? Is there something we can do? I see a strong correlation \n> between adding a new submodule and the number of \"git sucks\" messages on \n> our internal IRC server.\n> \n\nWell, reworking the repository structure (which is essentially what you're\ndoing) should be a flag day. Merge stuff before that and mark it in some\nway so that you don't run into the problems you're seeing now.\n\n-- \nAndreas Ericsson andreas.ericsson@op5.se\nOP5 AB www.op5.se\nTel: +46 8-230225 Fax: +46 8-230231\n"},{"id":"100502","messageId":"alpine.DEB.1.00.0901142354120.3586@pacific.mpi-cbg.de","threadId":"17068","inReplyTo":"ADC7A3B1-6756-4258-93CD-DB40C7D2793C@develooper.com","subject":"Re: git submodule merge madness","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2009-01-14T22:55:43Z","receivedAt":"2009-01-14T22:55:43Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Fri, 9 Jan 2009, Ask Bjørn Hansen wrote:\n\n> We've (again) replaced a few directories with submodules. Man, it's \n> madness!\n> \n> The typical problem is that we get an error trying to merge a \"pre-submodule\"\n> branch into master:\n> \n> \tfatal: cannot read object 894c77319a18c4d48119c2985a9275c9f5883584\n> 'some/sub/dir': It is a submodule!\n> Mark Levedahl wrote an example in July, but I don't think he got any replies:\n> http://marc.info/?l=git&m=121587851313303\n\nSo.... Which Git version are you are using? Did you test any Git version \ncontaining the commit d5a84fb(merge-recursive: fail gracefully with \ndirectory/submodule conflicts)?\n\nCiao,\nDscho\n"},{"id":"100510","messageId":"AE1922C4-0543-424B-A635-494445E17E45@develooper.com","threadId":"17068","inReplyTo":"alpine.DEB.1.00.0901142354120.3586@pacific.mpi-cbg.de","subject":"Re: git submodule merge madness","fromName":"Ask Bjørn Hansen","fromEmail":"ask@develooper.com","sentAt":"2009-01-14T23:49:27Z","receivedAt":"2009-01-14T23:49:27Z","isPatch":false,"sender":{"key":"ask@develooper.com","avatar":"https://gravatar.com/avatar/05ce68433216df7d04bb0d82b7d93b11957e2137e6ed23c4b5bc061d78635f2f?d=mp&s=160"},"body":"\nOn Jan 14, 2009, at 2:55 PM, Johannes Schindelin wrote:\n\n>> We've (again) replaced a few directories with submodules. Man, it's\n>> madness!\n>>\n>> The typical problem is that we get an error trying to merge a \"pre- \n>> submodule\"\n>> branch into master:\n>>\n>> \tfatal: cannot read object 894c77319a18c4d48119c2985a9275c9f5883584\n>> 'some/sub/dir': It is a submodule!\n>> Mark Levedahl wrote an example in July, but I don't think he got \n>> any replies:\n>> http://marc.info/?l=git&m=121587851313303\n>\n> So.... Which Git version are you are using? Did you test any Git \n> version\n> containing the commit d5a84fb(merge-recursive: fail gracefully with\n> directory/submodule conflicts)?\n\nIIRC I tried 1.6.1 and master as of about a week ago.\n\nI don't see d5a84fb in my repository (and google doesn't find it \nreferenced anywhere when I search for \"directory/submodule conflicts\".\n\n\n - ask\n\n-- \nhttp://develooper.com/ - http://askask.com/\n"},{"id":"100518","messageId":"bd6139dc0901141632x6d3a0b6bl3abd489e155dc97d@mail.gmail.com","threadId":"17068","inReplyTo":"AE1922C4-0543-424B-A635-494445E17E45@develooper.com","subject":"Re: git submodule merge madness","fromName":"Sverre Rabbelier","fromEmail":"srabbelier@gmail.com","sentAt":"2009-01-15T00:32:31Z","receivedAt":"2009-01-15T00:32:31Z","isPatch":false,"sender":{"key":"srabbelier@gmail.com","avatar":"https://avatars.githubusercontent.com/u/3098?v=4"},"body":"On Thu, Jan 15, 2009 at 00:49, Ask Bjørn Hansen wrote:\n> On Jan 14, 2009, at 2:55 PM, Johannes Schindelin wrote:\n>> So.... Which Git version are you are using? Did you test any Git version\n>> containing the commit d5a84fb(merge-recursive: fail gracefully with\n>> directory/submodule conflicts)?\n>\n> IIRC I tried 1.6.1 and master as of about a week ago.\n>\n> I don't see d5a84fb in my repository (and google doesn't find it referenced\n> anywhere when I search for \"directory/submodule conflicts\".\n\nI checked current master:\n$ git log --grep=\"fail gracefully with\"\nreturns nothing. Searching the archive I don't see any reference to\n\"fail gracefully with\" either. I don't see it on your gitweb [0]\neither. Did that commit magically dissapear?\n\n[0] http://repo.or.cz/w/git/dscho.git\n\n-- \nCheers,\n\nSverre Rabbelier\n"},{"id":"100520","messageId":"alpine.DEB.1.00.0901150134530.3586@pacific.mpi-cbg.de","threadId":"17068","inReplyTo":"AE1922C4-0543-424B-A635-494445E17E45@develooper.com","subject":"Re: git submodule merge madness","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2009-01-15T00:36:24Z","receivedAt":"2009-01-15T00:36:24Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Wed, 14 Jan 2009, Ask Bjørn Hansen wrote:\n\n> On Jan 14, 2009, at 2:55 PM, Johannes Schindelin wrote:\n> \n> > >We've (again) replaced a few directories with submodules. Man, it's \n> > >madness!\n> > >\n> > >The typical problem is that we get an error trying to merge a \n> > >\"pre-submodule\" branch into master:\n> > >\n> > >\tfatal: cannot read object 894c77319a18c4d48119c2985a9275c9f5883584\n> > >'some/sub/dir': It is a submodule!\n> > >Mark Levedahl wrote an example in July, but I don't think he got any\n> > >replies:\n> > >http://marc.info/?l=git&m=121587851313303\n> >\n> >So.... Which Git version are you are using? Did you test any Git version\n> >containing the commit d5a84fb(merge-recursive: fail gracefully with\n> >directory/submodule conflicts)?\n> \n> IIRC I tried 1.6.1 and master as of about a week ago.\n> \n> I don't see d5a84fb in my repository (and google doesn't find it referenced\n> anywhere when I search for \"directory/submodule conflicts\".\n\nWell. Can do arithmetics in my head after midnight, but not think \nstraight...\n\nIn any case, could you please provide a patch to the testsuite \ndemonstrating the problem? History shows that such patches are very \nhelpful.\n\nCiao,\nDscho\n"}]}