Easy way to pull latest of all git submodules
We're using git submodules to manage a couple of large projects that have dependencies on many other libraries we've developed. Each library is a separate repo brought into the dependant project as a submodule. During development, we often want to just go grab the latest version of every dependant submodule.
Does git have a built in command to do this? If not, how about a Windows batch file or similar that can do it?
For git 1.8.2 or above the option --remote was added to support updating to latest tips of remote branches:
git submodule update --recursive --remote
This has the added benefit of respecting any "non default" branches specified in the .gitmodules or .git/config files (if you happen to have any, default is origin/master, in which case some of the other answers here would work as well).
For git 1.7.3 or above you can use (but the below gotchas around what update does still apply):
git submodule update --recursive
or:
git pull --recurse-submodules
if you want to pull your submodules to latest commits intead of what the repo points to.
Note: If that's the first time you checkout a repo you need to use --init first:
git submodule update --init --recursive
For older, git 1.6.1 or above you can use something similar to (modified to suit):
git submodule foreach git pull origin master
See git-submodule(1) for details
If you need to pull stuff for submodules into your submodule repositories use
git pull --recurse-submodules
a feature git first learned in 1.7.3.
But this will not checkout proper commits(the ones your master repository points to) in submodules
To checkout proper commits in your submodules you should update them after pulling using
git submodule update --recursive --remote
Note: This is from 2009 and may have been good then but there are better options now.
We use this. It's called git-pup :
#!/bin/bash
# Exists to fully update the git repo that you are sitting in...
git pull && git submodule init && git submodule update && git submodule status
Just put it in a suitable bin directory (/usr/local/bin). If on Windows, you may need to modify the syntax to get it to work :)
Update:
In response to the comment by the original author about pulling in all of the HEADs of all of the submodules -- that is a good question.
I am pretty sure that git does not have a command for this internally. In order to do so, you would need to identify what HEAD really is for a submodule. That could be as simple as saying master is the most up to date branch, etc...
Following this, create a simple script that does the following:
git submodule status for "modified" repositories. The first character of the output lines indicates this. If a sub-repo is modified, you may NOT want to proceed. git checkout master && git pull . Check for errors. I'd like to mention that this style is not really what git submodules were designed for. Typically, you want to say "LibraryX" is at version "2.32" and will stay that way until I tell it to "upgrade".
That is, in a sense, what you are doing with the described script, but just more automatically. Care is required!
Update 2:
If you are on a windows platform, you may want to look at using Python to implement the script as it is very capable in these areas. If you are on unix/linux, then I suggest just a bash script.
Need any clarifications? Just post a comment.
链接地址: http://www.djcxy.com/p/2698.html上一篇: 如何`git克隆`包括子模块？