search

WestMichiganRubyTraining / discussion

Create issues on this repository to open discussion threads in the Issue Tracker!
2 stars 0 forks source link

Git submodules #77

Open ThomasBush opened 10 years ago

ThomasBush commented 10 years ago

I am working on setting up vagrant + chef + magento and found an open source solution that was very close to what I needed. I forked a repository which uses submodules. I also forked one of the submodules. I made changes to this submodule as well as the main repo and pushed back to my forks of each. One of the changes to my fork of the main repo was to the .gitmodules file, in an effort to ensure my forked submodule would be used by my forked main project. This link is somehow incorrect as the original submodule is pulled every time instead of my fork.

.gitmodules

[submodule "recipes/cookbooks/vagrant_magento"]
    path = recipes/cookbooks/vagrant_magento
    url = https://github.com/HexArmor/vagrant_magento

Forked Repos

I used this SO answer as well as this SO question as my troubleshooting guides. Following the various answers in each proved unsuccessful.

Looking at the specific submodule section of my fork's git repo appears to prove I have linked these correctly. Clicking on vagrant_magento or the included reference tag both land you on my submodules fork which is what I want to be used here. Yet this page says it has not been updated in over a year, which confuses me and pull down the repo and running git submodule update --init still pulls in the old submodule.

Any help would be greatly appreciated!

Thanks, Thomas Bush

ThomasBush commented 10 years ago

I hadn't heard from anyone on here, so I posted the question to StackOverflow and added a 50 rep bounty in hopes that might entice an answer. If you are interested, visit the SO question.

Thanks for any help you can provide, Thomas

billgathen commented 10 years ago

I've never used sub-modules -- and from the silence, it seems nobody else on here has either -- so if you've got any good intro resources, please drop them in here. I'm also interested in how you solve the problem, when you do.

DavidBechtel commented 10 years ago

Thom,

Does this not address your question?

https://devcenter.heroku.com/articles/git-submodules

Dave Bechtel

On Tuesday, October 28, 2014 11:39 AM, Bill Gathen notifications@github.com wrote:

I've never used sub-modules -- and from the silence, it seems nobody else on here has either -- so if you've got any good intro resources, please drop them in here. I'm also interested in how you solve the problem, when you do. — Reply to this email directly or view it on GitHub.

ThomasBush commented 10 years ago

@billgathen I got this working with the answer on SO. Apparently I needed to change the submodule's branch to the master branch which seems obvious. I was attempting to run the various submodule commands with no success, but never contemplated branching as an issue. I am very new to submodules, and am trying to learn out of necessity for also learning Vagrant and Chef. It seems like (in my limited experience) submodules are the preferred method for setting up your Chef cookbooks.

@DavidBechtel - Thanks for the resource, I have not read it entirely yet as I received an SO answer that solved the problem, but I plan on reading this so I can better understand submodules.

DavidBechtel commented 10 years ago

When I googled "ruby rails submodule" I got the referenced link along with some others, one of them talked about using a branch to validate moving to rails 4.0, so his branch was using submodules that were 4.0 compatible while his main remained at the older versions of submodules.

This sounds similar to your case. I don't think he went into too much detail about how he did it, but is sounds like he worked it out.

Dave Bechtel

On Tuesday, October 28, 2014 2:54 PM, Thomas Bush notifications@github.com wrote:

@billgathen I got this working with the answer on SO. Apparently I needed to change the submodule's branch to the master branch which seems obvious. I was attempting to run the various submodule commands with no success, but never contemplated branching as an issue. I am very new to submodules, and am trying to learn out of necessity for also learning Vagrant and Chef. It seems like (in my limited experience) submodules are the preferred method for setting up your Chef cookbooks. @DavidBechtel - Thanks for the resource, I have not read it entirely yet as I received an SO answer that solved the problem, but I plan on reading this so I can better understand submodules. — Reply to this email directly or view it on GitHub.