2007-06-12 09:05:21 +02:00
|
|
|
gitmodules(5)
|
|
|
|
|
=============
|
|
|
|
|
|
|
|
|
|
NAME
|
|
|
|
|
----
|
|
|
|
|
gitmodules - defining submodule properties
|
|
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
|
--------
|
2008-08-31 18:00:27 +02:00
|
|
|
$GIT_WORK_DIR/.gitmodules
|
2007-06-12 09:05:21 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
|
DESCRIPTION
|
|
|
|
|
-----------
|
|
|
|
|
|
2013-01-21 20:17:53 +01:00
|
|
|
The `.gitmodules` file, located in the top-level directory of a Git
|
2007-06-12 09:05:21 +02:00
|
|
|
working tree, is a text file with a syntax matching the requirements
|
2007-12-29 07:20:38 +01:00
|
|
|
of linkgit:git-config[1].
|
2007-06-12 09:05:21 +02:00
|
|
|
|
|
|
|
|
The file contains one subsection per submodule, and the subsection value
|
2012-09-30 01:05:58 +02:00
|
|
|
is the name of the submodule. The name is set to the path where the
|
|
|
|
|
submodule has been added unless it was customized with the '--name'
|
|
|
|
|
option of 'git submodule add'. Each submodule section also contains the
|
2007-06-12 09:05:21 +02:00
|
|
|
following required keys:
|
|
|
|
|
|
|
|
|
|
submodule.<name>.path::
|
2013-01-21 20:17:53 +01:00
|
|
|
Defines the path, relative to the top-level directory of the Git
|
2007-06-12 09:05:21 +02:00
|
|
|
working tree, where the submodule is expected to be checked out.
|
|
|
|
|
The path name must not end with a `/`. All submodule paths must
|
|
|
|
|
be unique within the .gitmodules file.
|
|
|
|
|
|
|
|
|
|
submodule.<name>.url::
|
2012-03-28 10:41:54 +02:00
|
|
|
Defines a URL from which the submodule repository can be cloned.
|
2010-07-15 09:41:55 +02:00
|
|
|
This may be either an absolute URL ready to be passed to
|
|
|
|
|
linkgit:git-clone[1] or (if it begins with ./ or ../) a location
|
|
|
|
|
relative to the superproject's origin repository.
|
2007-06-12 09:05:21 +02:00
|
|
|
|
Rename submodule.<name>.rebase to submodule.<name>.update
The addition of "submodule.<name>.rebase" demonstrates the usefulness of
alternatives to the default behaviour of "git submodule update". However,
by naming the config variable "submodule.<name>.rebase", and making it a
boolean choice, we are artificially constraining future git versions that
may want to add _more_ alternatives than just "rebase".
Therefore, while "submodule.<name>.rebase" is not yet in a stable git
release, future-proof it, by changing it from
submodule.<name>.rebase = true/false
to
submodule.<name>.update = rebase/checkout
where "checkout" specifies the default behaviour of "git submodule update"
(checking out the new commit to a detached HEAD), and "rebase" specifies
the --rebase behaviour (where the current local branch in the submodule is
rebase onto the new commit). Thus .update == checkout is equivalent to
.rebase == false, and .update == rebase is equivalent to .rebase == true.
Finally, leaving .update unset is equivalent to leaving .rebase unset.
In future git versions, other alternatives to "git submodule update"
behaviour can be included by adding them to the list of allowable values
for the submodule.<name>.update variable.
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-06-03 08:27:06 +02:00
|
|
|
submodule.<name>.update::
|
|
|
|
|
Defines what to do when the submodule is updated by the superproject.
|
|
|
|
|
If 'checkout' (the default), the new commit specified in the
|
|
|
|
|
superproject will be checked out in the submodule on a detached HEAD.
|
|
|
|
|
If 'rebase', the current branch of the submodule will be rebased onto
|
2009-06-03 00:59:12 +02:00
|
|
|
the commit specified in the superproject. If 'merge', the commit
|
|
|
|
|
specified in the superproject will be merged into the current branch
|
|
|
|
|
in the submodule.
|
2012-05-10 20:59:04 +02:00
|
|
|
If 'none', the submodule with name `$name` will not be updated
|
|
|
|
|
by default.
|
|
|
|
|
|
Rename submodule.<name>.rebase to submodule.<name>.update
The addition of "submodule.<name>.rebase" demonstrates the usefulness of
alternatives to the default behaviour of "git submodule update". However,
by naming the config variable "submodule.<name>.rebase", and making it a
boolean choice, we are artificially constraining future git versions that
may want to add _more_ alternatives than just "rebase".
Therefore, while "submodule.<name>.rebase" is not yet in a stable git
release, future-proof it, by changing it from
submodule.<name>.rebase = true/false
to
submodule.<name>.update = rebase/checkout
where "checkout" specifies the default behaviour of "git submodule update"
(checking out the new commit to a detached HEAD), and "rebase" specifies
the --rebase behaviour (where the current local branch in the submodule is
rebase onto the new commit). Thus .update == checkout is equivalent to
.rebase == false, and .update == rebase is equivalent to .rebase == true.
Finally, leaving .update unset is equivalent to leaving .rebase unset.
In future git versions, other alternatives to "git submodule update"
behaviour can be included by adding them to the list of allowable values
for the submodule.<name>.update variable.
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-06-03 08:27:06 +02:00
|
|
|
This config option is overridden if 'git submodule update' is given
|
2012-05-10 20:59:04 +02:00
|
|
|
the '--merge', '--rebase' or '--checkout' options.
|
2009-04-24 01:06:38 +02:00
|
|
|
|
submodule update: add --remote for submodule's upstream changes
The current `update` command incorporates the superproject's gitlinked
SHA-1 ($sha1) into the submodule HEAD ($subsha1). Depending on the
options you use, it may checkout $sha1, rebase the $subsha1 onto
$sha1, or merge $sha1 into $subsha1. This helps you keep up with
changes in the upstream superproject.
However, it's also useful to stay up to date with changes in the
upstream subproject. Previous workflows for incorporating such
changes include the ungainly:
$ git submodule foreach 'git checkout $(git config --file $toplevel/.gitmodules submodule.$name.branch) && git pull'
With this patch, all of the useful functionality for incorporating
superproject changes can be reused to incorporate upstream subproject
updates. When you specify --remote, the target $sha1 is replaced with
a $sha1 of the submodule's origin/master tracking branch. If you want
to merge a different tracking branch, you can configure the
`submodule.<name>.branch` option in `.gitmodules`. You can override
the `.gitmodules` configuration setting for a particular superproject
by configuring the option in that superproject's default configuration
(using the usual configuration hierarchy, e.g. `.git/config`,
`~/.gitconfig`, etc.).
Previous use of submodule.<name>.branch
=======================================
Because we're adding a new configuration option, it's a good idea to
check if anyone else is already using the option. The foreach-pull
example above was described by Ævar in
commit f030c96d8643fa0a1a9b2bd9c2f36a77721fb61f
Author: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Fri May 21 16:10:10 2010 +0000
git-submodule foreach: Add $toplevel variable
Gerrit uses the same interpretation for the setting, but because
Gerrit has direct access to the subproject repositories, it updates
the superproject repositories automatically when a subproject changes.
Gerrit also accepts the special value '.', which it expands into the
superproject's branch name.
Although the --remote functionality is using `submodule.<name>.branch`
slightly differently, the effect is the same. The foreach-pull
example uses the option to record the name of the local branch to
checkout before pulls. The tracking branch to be pulled is recorded
in `.git/modules/<name>/config`, which was initialized by the module
clone during `submodule add` or `submodule init`. Because the branch
name stored in `submodule.<name>.branch` was likely the same as the
branch name used during the initial `submodule add`, the same branch
will be pulled in each workflow.
Implementation details
======================
In order to ensure a current tracking branch state, `update --remote`
fetches the submodule's remote repository before calculating the
SHA-1. However, I didn't change the logic guarding the existing fetch:
if test -z "$nofetch"
then
# Run fetch only if $sha1 isn't present or it
# is not reachable from a ref.
(clear_local_git_env; cd "$path" &&
( (rev=$(git rev-list -n 1 $sha1 --not --all 2>/dev/null) &&
test -z "$rev") || git-fetch)) ||
die "$(eval_gettext "Unable to fetch in submodule path '\$path'")"
fi
There will not be a double-fetch, because the new $sha1 determined
after the `--remote` triggered fetch should always exist in the
repository. If it doesn't, it's because some racy process removed it
from the submodule's repository and we *should* be re-fetching.
Signed-off-by: W. Trevor King <wking@tremily.us>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-12-19 17:03:32 +01:00
|
|
|
submodule.<name>.branch::
|
|
|
|
|
A remote branch name for tracking updates in the upstream submodule.
|
|
|
|
|
If the option is not specified, it defaults to 'master'. See the
|
|
|
|
|
`--remote` documentation in linkgit:git-submodule[1] for details.
|
|
|
|
|
|
2010-11-11 00:55:41 +01:00
|
|
|
submodule.<name>.fetchRecurseSubmodules::
|
2011-03-06 23:12:19 +01:00
|
|
|
This option can be used to control recursive fetching of this
|
2010-11-11 00:55:41 +01:00
|
|
|
submodule. If this option is also present in the submodules entry in
|
|
|
|
|
.git/config of the superproject, the setting there will override the
|
|
|
|
|
one found in .gitmodules.
|
2011-01-03 20:03:34 +01:00
|
|
|
Both settings can be overridden on the command line by using the
|
2011-03-06 23:12:19 +01:00
|
|
|
"--[no-]recurse-submodules" option to "git fetch" and "git pull".
|
2010-11-11 00:55:41 +01:00
|
|
|
|
2010-08-06 00:40:48 +02:00
|
|
|
submodule.<name>.ignore::
|
|
|
|
|
Defines under what circumstances "git status" and the diff family show
|
|
|
|
|
a submodule as modified. When set to "all", it will never be considered
|
|
|
|
|
modified, "dirty" will ignore all changes to the submodules work tree and
|
|
|
|
|
takes only differences between the HEAD of the submodule and the commit
|
|
|
|
|
recorded in the superproject into account. "untracked" will additionally
|
|
|
|
|
let submodules with modified tracked files in their work tree show up.
|
|
|
|
|
Using "none" (the default when this option is not set) also shows
|
|
|
|
|
submodules that have untracked files in their work tree as changed.
|
|
|
|
|
If this option is also present in the submodules entry in .git/config of
|
|
|
|
|
the superproject, the setting there will override the one found in
|
|
|
|
|
.gitmodules.
|
2010-08-22 13:12:12 +02:00
|
|
|
Both settings can be overridden on the command line by using the
|
2010-08-06 00:40:48 +02:00
|
|
|
"--ignore-submodule" option.
|
|
|
|
|
|
2007-06-12 09:05:21 +02:00
|
|
|
|
|
|
|
|
EXAMPLES
|
|
|
|
|
--------
|
|
|
|
|
|
|
|
|
|
Consider the following .gitmodules file:
|
|
|
|
|
|
|
|
|
|
[submodule "libfoo"]
|
|
|
|
|
path = include/foo
|
|
|
|
|
url = git://foo.com/git/lib.git
|
|
|
|
|
|
|
|
|
|
[submodule "libbar"]
|
|
|
|
|
path = include/bar
|
|
|
|
|
url = git://bar.com/git/lib.git
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
This defines two submodules, `libfoo` and `libbar`. These are expected to
|
|
|
|
|
be checked out in the paths 'include/foo' and 'include/bar', and for both
|
2012-03-28 10:41:54 +02:00
|
|
|
submodules a URL is specified which can be used for cloning the submodules.
|
2007-06-12 09:05:21 +02:00
|
|
|
|
|
|
|
|
SEE ALSO
|
|
|
|
|
--------
|
2007-12-29 07:20:38 +01:00
|
|
|
linkgit:git-submodule[1] linkgit:git-config[1]
|
2007-06-12 09:05:21 +02:00
|
|
|
|
|
|
|
|
GIT
|
|
|
|
|
---
|
2008-06-06 09:07:32 +02:00
|
|
|
Part of the linkgit:git[1] suite
|