How to regularly merge two git repositories, one with submodules into one without

Posted by smoothify on Stack Overflow See other posts from Stack Overflow or by smoothify
Published on 2012-03-18T17:58:59Z Indexed on 2012/03/18 18:03 UTC
Read the original article Hit count: 293

Filed under:

git

|

git-submodules

I maintain a Drupal project in a git repository containing submodules. This works well for me overall, and I like the submodule approach.

However, I would like to move my site to a hosting provider that offers deployment via git push but doesn't work with submodules.

I would like to keep my current repository intact, and then when I'm ready to deploy, I would like to merge the changes from my repository into the deployment repository, but any submodules need to be exported into the tree.

So, it needs to be (semi) automated, so I can just run a command or two and initiate the merge, and then push to the server. Ideally it would keep track of individual commits, but I wouldn't mind if it squashed them into a single commit.

How would be the most effective way to achieve this?

© Stack Overflow or respective owner

Related posts about git

git pull gives error: 401 Authorization Required while accessing https://git.foo.com/bar.git

as seen on Stack Overflow - Search for 'Stack Overflow'
My macbook pro is able to clone/push/pull from the company git server. My cent 6.3 vm gets a 401 error git clone https://git.acme.com/git/torque-setup "error: The requested URL returned error: 401 Authorization Required while accessing https://git.acme.com/git/torque-setup/info/refs As a work… >>> More
Can't install git on Ubuntu 12.10

as seen on Ask Ubuntu - Search for 'Ask Ubuntu'
I'm following these instructions to install git on my laptop: http://git-scm.com/download/linux When I do: $ sudo apt-get install git-core This is what my terinal shows: Reading package lists... Done Building dependency tree Reading state information... Done The following packages… >>> More
Git apache : unable to push via http

as seen on Server Fault - Search for 'Server Fault'
I have to setup a server which can allow http vcs management (such as git and svn). svn support works well, but I have some trouble with git. Actual configuration: CentOS 5 Apache 2.2.8 Git 1.7.4.1 The /etc/httpd/conf/httpd.conf content: ServerTokens OS ServerRoot "/etc/httpd" PidFile run/httpd… >>> More
git on HTTP with gitolite and nginx

as seen on Server Fault - Search for 'Server Fault'
I am trying to setup a server where my git repo would be accessible with HTTP(S). I am using gitolite and nginx (and gitlab for web interface but I doubt it makes any difference). I have searched the whole afternoon and I think I'm stuck. I have think I have understood that nginx needs fcgiwrap… >>> More
Redmine git integration - issue in accessing git from redmine but not from external git client

as seen on Server Fault - Search for 'Server Fault'
I have setup redmine integration with apache as described in the redmine documentation. I have a /git path accessible with auth and /git-private accessible only to redmine. When I clone the repository through /git path, I get the up-to-date repo. But when I try to view it in redmine repo viewer, I… >>> More

Related posts about git-submodules

Using git submodules in a git-svn project

as seen on Stack Overflow - Search for 'Stack Overflow'
In our git-svn managed project, we have 3 upstream projects that are all kept in native git repositories on GitHub. Since the source code of those upstream projects is under our control and changes frequently, our current solution, namely re-deploying the build artifacts to the super-project everytime… >>> More
iOS: Versioned static frameworks vs Git Submodules and included code

as seen on Programmers - Search for 'Programmers'
For the last couple of years I've been building static frameworks of common APIs for my iOS projects. I can build a universal binary containing all the architectures (i386, armv6, armv7) and wrap it up in a .framework directory structure. I then stored this in a directory based on the version of the… >>> More
How can I run Git submodules?

as seen on Server Fault - Search for 'Server Fault'
How can I run these submodules? The only thing i can find on the web is information on how to create submodules. But i just need to run them. Is this really so difficult? After you have clone the repository, you'll need to run the following to pull in all the submodules: git submodule init git submodule… >>> More
Where should you put 3rd party .NET dlls when using git submodules to avoid duplication

as seen on Stack Overflow - Search for 'Stack Overflow'
I have two .NET library projects in Visual Studio 2008 that both make use of the MySql Connector for .NET (MySql.Data.dll). These libraries are then in turn both used by a .NET command line application which also uses the Connector. The library projects are pulled in to the application's solution… >>> More
Git submodules not updating?

as seen on Stack Overflow - Search for 'Stack Overflow'
I have a project in which I've included some libraries as submodules. They work fine on the machine that you add them on, but when I get home and checkout the repo, I get the folders for the submodules but they are empty. .gitmodules Neon@Neon-PC /cygdrive/c/xampp/htdocs/learning-lithium $ cat … >>> More