Git submodules workflow when modifying third party code

Question

So I have a project A with a third party dependency B which lives on some other server.

If I add B as a submodule of A, then I can easily get the third party changes to B using the standard submodule workflow. Furthermore, I can clone A to another machine and have B in the exact state that I'd expect.

If I add B as a submodule of A and make my own set of changes and commits to B, I can still get third party updates to B. However, if I try to clone A to another machine, B will end up in a bad state since the commits I made to B aren't 'public'.

What's a good workflow to accomplish this second scenario? Namely, being able to use, modify, and update third party submodules from a repository without sacrificing the distributed nature of git?

Jonah · Accepted Answer · 2012-01-10 08:02:17Z

4

Fork B. Include your fork as a submodule of A. Pulling upstream changes is then a two step process; pull the change from B into your fork, update your submodule in A.

This also assumes that your fork repository will be accessible to whatever other machine you want to checkout A on.

answered Jan 10, 2012 at 8:02

Jonah

18k1 gold badge46 silver badges71 bronze badges

Sign up to request clarification or add additional context in comments.

Collectives™ on Stack Overflow

Git submodules workflow when modifying third party code

1 Answer 1

Comments

Your Answer

Hot Network Questions

Collectives™ on Stack Overflow

1 Answer 1

Comments

Your Answer

Sign up or log in

Post as a guest

Related