|
|
|
#!/bin/sh
|
|
|
|
#
|
|
|
|
# git-submodules.sh: add, init, update or list git submodules
|
|
|
|
#
|
|
|
|
# Copyright (c) 2007 Lars Hjemli
|
|
|
|
|
|
|
|
dashless=$(basename "$0" | sed -e 's/-/ /')
|
|
|
|
USAGE="[--quiet] add [-b branch] [-f|--force] [--reference <repository>] [--] <repository> [<path>]
|
|
|
|
or: $dashless [--quiet] status [--cached] [--recursive] [--] [<path>...]
|
|
|
|
or: $dashless [--quiet] init [--] [<path>...]
|
|
|
|
or: $dashless [--quiet] update [--init] [-N|--no-fetch] [-f|--force] [--rebase] [--reference <repository>] [--merge] [--recursive] [--] [<path>...]
|
|
|
|
or: $dashless [--quiet] summary [--cached|--files] [--summary-limit <n>] [commit] [--] [<path>...]
|
|
|
|
or: $dashless [--quiet] foreach [--recursive] <command>
|
|
|
|
or: $dashless [--quiet] sync [--] [<path>...]"
|
|
|
|
OPTIONS_SPEC=
|
|
|
|
. git-sh-setup
|
|
|
|
. git-sh-i18n
|
|
|
|
. git-parse-remote
|
|
|
|
require_work_tree
|
|
|
|
|
|
|
|
command=
|
|
|
|
branch=
|
|
|
|
force=
|
|
|
|
reference=
|
|
|
|
cached=
|
|
|
|
recursive=
|
|
|
|
init=
|
|
|
|
files=
|
|
|
|
nofetch=
|
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>
16 years ago
|
|
|
update=
|
|
|
|
prefix=
|
|
|
|
|
|
|
|
# Resolve relative url by appending to parent's url
|
|
|
|
resolve_relative_url ()
|
|
|
|
{
|
|
|
|
remote=$(get_default_remote)
|
|
|
|
remoteurl=$(git config "remote.$remote.url") ||
|
|
|
|
remoteurl=$(pwd) # the repository is its own authoritative upstream
|
|
|
|
url="$1"
|
git-submodule.sh - Remove trailing / from URL if found
git clone does not complain if a trailing '/' is included in the origin
URL, but doing so causes resolution of a submodule's URL relative to the
superproject to fail. Trailing /'s are likely when cloning locally using
tab-completion, so the slash may appear in either superproject or
submodule URL. So, ignore the trailing slash if it already exists in
the superproject's URL, and don't record one for the submodule (which
could itself have submodules...).
The problem I'm trying to fix is that a number of folks have
superprojects checked out where the recorded origin URL has a trailing
/, and a submodule has its origin in a directory sitting right next to
the superproject on the server. Thus, we have:
superproject url = server:/public/super
submodoule url = server:/public/sub1
However, in the checked out superproject's .git/config
[remote "origin"]
url = server:/public/super/
and for similar reasons, the submodule has its URL recorded in .gitmodules as
[submodule "sub"]
path = submodule1
url = ../sub1/
resolve_relative_url gets the submodule's recorded url as $1, which
the caller retrieved from .gitmodules, and retrieves the superprojects
origin from .git/config. So in this case resolve_relative_url has
that:
url = ../sub1/
remoteurl = server:/public/super/
So, without any patch, resolve_relative_url computes the submodule's URL as:
server:/public/super/sub1/
rather than
server:/public/sub1
In summary, it is essential that resolve_relative_url strip the
trailing / from the superproject's url before starting, and
beneficial if it assures that the result does not contain
a trailing / as the submodule may itself also be a superproject.
Signed-off-by: Mark Levedahl <mlevedahl@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years ago
|
|
|
remoteurl=${remoteurl%/}
|
|
|
|
sep=/
|
|
|
|
while test -n "$url"
|
|
|
|
do
|
|
|
|
case "$url" in
|
|
|
|
../*)
|
|
|
|
url="${url#../}"
|
|
|
|
case "$remoteurl" in
|
|
|
|
*/*)
|
|
|
|
remoteurl="${remoteurl%/*}"
|
|
|
|
;;
|
|
|
|
*:*)
|
|
|
|
remoteurl="${remoteurl%:*}"
|
|
|
|
sep=:
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
die "$(eval_gettext "cannot strip one component off url '\$remoteurl'")"
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
;;
|
|
|
|
./*)
|
|
|
|
url="${url#./}"
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
break;;
|
|
|
|
esac
|
|
|
|
done
|
|
|
|
echo "$remoteurl$sep${url%/}"
|
|
|
|
}
|
|
|
|
|
|
|
|
#
|
|
|
|
# Get submodule info for registered submodules
|
|
|
|
# $@ = path to limit submodule list
|
|
|
|
#
|
|
|
|
module_list()
|
|
|
|
{
|
submodule: process conflicting submodules only once
During a merge module_list returns conflicting submodules several times
(stage 1,2,3) which caused the submodules to be used multiple times in
git submodule init, sync, update and status command.
There are 5 callers of module_list; they all read (mode, sha1, stage,
path) tuple, and most of them care only about path. As a first level
approximation, it should be Ok (in the sense that it does not make things
worse than it currently is) to filter the duplicate paths from module_list
output, but some callers should change their behaviour when the merge in
the superproject still has conflicts.
Notice the higher-stage entries, and emit only one record from
module_list, but while doing so, mark the entry with "U" (not [0-3]) in
the $stage field and null out the SHA-1 part, as the object name for the
lowest stage does not give any useful information to the caller, and this
way any caller that uses the object name would hopefully barf. Then
update the codepaths for each subcommands this way:
- "update" should not touch the submodule repository, because we do not
know what commit should be checked out yet.
- "status" reports the conflicting submodules as 'U000...000' and does
not recurse into them (we might later want to make it recurse).
- The command called by "foreach" may want to do whatever it wants to do
by noticing the merged status in the superproject itself, so feed the
path to it from module_list as before, but only once per submodule.
- "init" and "sync" are unlikely things to do while the superproject is
still not merged, but as long as a submodule is there in $path, there
is no point skipping it. It might however want to take the merged
status of .gitmodules into account, but that is outside of the scope of
this topic.
Acked-by: Jens Lehmann <Jens.Lehmann@web.de>
Thanks-to: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Nicolas Morey-Chaisemartin <nicolas@morey-chaisemartin.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
14 years ago
|
|
|
git ls-files --error-unmatch --stage -- "$@" |
|
|
|
|
perl -e '
|
|
|
|
my %unmerged = ();
|
|
|
|
my ($null_sha1) = ("0" x 40);
|
|
|
|
while (<STDIN>) {
|
|
|
|
chomp;
|
|
|
|
my ($mode, $sha1, $stage, $path) =
|
|
|
|
/^([0-7]+) ([0-9a-f]{40}) ([0-3])\t(.*)$/;
|
|
|
|
next unless $mode eq "160000";
|
|
|
|
if ($stage ne "0") {
|
|
|
|
if (!$unmerged{$path}++) {
|
|
|
|
print "$mode $null_sha1 U\t$path\n";
|
|
|
|
}
|
|
|
|
next;
|
|
|
|
}
|
|
|
|
print "$_\n";
|
|
|
|
}
|
|
|
|
'
|
|
|
|
}
|
|
|
|
|
|
|
|
#
|
|
|
|
# Map submodule path to submodule name
|
|
|
|
#
|
|
|
|
# $1 = path
|
|
|
|
#
|
|
|
|
module_name()
|
|
|
|
{
|
|
|
|
# Do we have "submodule.<something>.path = $1" defined in .gitmodules file?
|
|
|
|
re=$(printf '%s\n' "$1" | sed -e 's/[].[^$\\*]/\\&/g')
|
|
|
|
name=$( git config -f .gitmodules --get-regexp '^submodule\..*\.path$' |
|
|
|
|
sed -n -e 's|^submodule\.\(.*\)\.path '"$re"'$|\1|p' )
|
|
|
|
test -z "$name" &&
|
|
|
|
die "$(eval_gettext "No submodule mapping found in .gitmodules for path '\$path'")"
|
|
|
|
echo "$name"
|
|
|
|
}
|
|
|
|
|
|
|
|
#
|
|
|
|
# Clone a submodule
|
|
|
|
#
|
|
|
|
# Prior to calling, cmd_update checks that a possibly existing
|
|
|
|
# path is not a git repository.
|
|
|
|
# Likewise, cmd_add checks that path does not exist at all,
|
|
|
|
# since it is the location of a new submodule.
|
|
|
|
#
|
|
|
|
module_clone()
|
|
|
|
{
|
|
|
|
path=$1
|
|
|
|
url=$2
|
|
|
|
reference="$3"
|
|
|
|
quiet=
|
|
|
|
if test -n "$GIT_QUIET"
|
|
|
|
then
|
|
|
|
quiet=-q
|
|
|
|
fi
|
|
|
|
|
|
|
|
gitdir=
|
|
|
|
gitdir_base=
|
|
|
|
name=$(module_name "$path" 2>/dev/null)
|
|
|
|
test -n "$name" || name="$path"
|
|
|
|
base_path=$(dirname "$path")
|
|
|
|
|
|
|
|
gitdir=$(git rev-parse --git-dir)
|
|
|
|
gitdir_base="$gitdir/modules/$base_path"
|
|
|
|
gitdir="$gitdir/modules/$path"
|
|
|
|
|
|
|
|
case $gitdir in
|
|
|
|
/*)
|
|
|
|
a="$(cd_to_toplevel && pwd)/"
|
|
|
|
b=$gitdir
|
|
|
|
while [ "$b" ] && [ "${a%%/*}" = "${b%%/*}" ]
|
|
|
|
do
|
|
|
|
a=${a#*/} b=${b#*/};
|
|
|
|
done
|
|
|
|
|
|
|
|
rel="$a$name"
|
|
|
|
rel=`echo $rel | sed -e 's|[^/]*|..|g'`
|
|
|
|
rel_gitdir="$rel/$b"
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
rel=`echo $name | sed -e 's|[^/]*|..|g'`
|
|
|
|
rel_gitdir="$rel/$gitdir"
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
|
|
|
if test -d "$gitdir"
|
|
|
|
then
|
|
|
|
mkdir -p "$path"
|
|
|
|
echo "gitdir: $rel_gitdir" >"$path/.git"
|
|
|
|
rm -f "$gitdir/index"
|
|
|
|
else
|
|
|
|
mkdir -p "$gitdir_base"
|
|
|
|
if test -n "$reference"
|
|
|
|
then
|
|
|
|
git-clone $quiet "$reference" -n "$url" "$path" --separate-git-dir "$gitdir"
|
|
|
|
else
|
|
|
|
git-clone $quiet -n "$url" "$path" --separate-git-dir "$gitdir"
|
|
|
|
fi ||
|
|
|
|
die "$(eval_gettext "Clone of '\$url' into submodule path '\$path' failed")"
|
|
|
|
fi
|
|
|
|
}
|
|
|
|
|
|
|
|
#
|
|
|
|
# Add a new submodule to the working tree, .gitmodules and the index
|
|
|
|
#
|
git-submodule - make "submodule add" more strict, and document it
This change makes "submodule add" much more strict in the arguments it
takes, and is intended to address confusion as recently noted on the
git-list. With this change, the required syntax is:
$ git submodule add URL path
Specifically, this eliminates the form
$ git submodule add URL
which was confused by more than one person as
$ git submodule add path
With this patch, the URL locating the submodule's origin repository can be
either an absolute URL, or (if it begins with ./ or ../) can express the
submodule's repository location relative to the superproject's origin.
This patch also eliminates a third form of URL, which was relative to the
superproject's top-level directory (not its repository). Any URL that was
neither absolute nor matched ./*|../* was assumed to point to a
subdirectory of the superproject as the location of the submodule's origin
repository. This URL form was confusing and does not seem to correspond
to an important use-case. Specifically, no-one has identified the need to
clone from a repository already in the superproject's tree, but if this is
needed it is easily done using an absolute URL: $(pwd)/relative-path. So,
no functionality is lost with this patch. (t6008-rev-list-submodule.sh did
rely upon this relative URL, fixed by using $(pwd).)
Following this change, there are exactly four variants of
submodule-add, as both arguments have two flavors:
URL can be absolute, or can begin with ./|../ and thus names the
submodule's origin relative to the superproject's origin.
Note: With this patch, "submodule add" discerns an absolute URL as
matching /*|*:*: e.g., URL begins with /, or it contains a :. This works
for all valid URLs, an absolute path in POSIX, as well as an absolute path
on Windows).
path can either already exist as a valid git repo, or will be cloned from
the given URL. The first form here eases creation of a new submodule in
an existing superproject as the submodule can be added and tested in-tree
before pushing to the public repository. However, the more usual form is
the second, where the repo is cloned from the given URL.
This specifically addresses the issue of
$ git submodule add a/b/c
attempting to clone from a repository at "a/b/c" to create a new module
in "c". This also simplifies description of "relative URL" as there is now
exactly *one* form: a URL relative to the parent's origin repo.
Signed-off-by: Mark Levedahl <mlevedahl@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years ago
|
|
|
# $@ = repo path
|
|
|
|
#
|
|
|
|
# optional branch is stored in global branch variable
|
|
|
|
#
|
|
|
|
cmd_add()
|
|
|
|
{
|
|
|
|
# parse $args after "submodule ... add".
|
|
|
|
while test $# -ne 0
|
|
|
|
do
|
|
|
|
case "$1" in
|
|
|
|
-b | --branch)
|
|
|
|
case "$2" in '') usage ;; esac
|
|
|
|
branch=$2
|
|
|
|
shift
|
|
|
|
;;
|
|
|
|
-f | --force)
|
|
|
|
force=$1
|
|
|
|
;;
|
|
|
|
-q|--quiet)
|
|
|
|
GIT_QUIET=1
|
|
|
|
;;
|
|
|
|
--reference)
|
|
|
|
case "$2" in '') usage ;; esac
|
|
|
|
reference="--reference=$2"
|
|
|
|
shift
|
|
|
|
;;
|
|
|
|
--reference=*)
|
|
|
|
reference="$1"
|
|
|
|
shift
|
|
|
|
;;
|
|
|
|
--)
|
|
|
|
shift
|
|
|
|
break
|
|
|
|
;;
|
|
|
|
-*)
|
|
|
|
usage
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
break
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
shift
|
|
|
|
done
|
|
|
|
|
|
|
|
repo=$1
|
|
|
|
path=$2
|
|
|
|
|
|
|
|
if test -z "$path"; then
|
|
|
|
path=$(echo "$repo" |
|
|
|
|
sed -e 's|/$||' -e 's|:*/*\.git$||' -e 's|.*[/:]||g')
|
|
|
|
fi
|
|
|
|
|
git-submodule - make "submodule add" more strict, and document it
This change makes "submodule add" much more strict in the arguments it
takes, and is intended to address confusion as recently noted on the
git-list. With this change, the required syntax is:
$ git submodule add URL path
Specifically, this eliminates the form
$ git submodule add URL
which was confused by more than one person as
$ git submodule add path
With this patch, the URL locating the submodule's origin repository can be
either an absolute URL, or (if it begins with ./ or ../) can express the
submodule's repository location relative to the superproject's origin.
This patch also eliminates a third form of URL, which was relative to the
superproject's top-level directory (not its repository). Any URL that was
neither absolute nor matched ./*|../* was assumed to point to a
subdirectory of the superproject as the location of the submodule's origin
repository. This URL form was confusing and does not seem to correspond
to an important use-case. Specifically, no-one has identified the need to
clone from a repository already in the superproject's tree, but if this is
needed it is easily done using an absolute URL: $(pwd)/relative-path. So,
no functionality is lost with this patch. (t6008-rev-list-submodule.sh did
rely upon this relative URL, fixed by using $(pwd).)
Following this change, there are exactly four variants of
submodule-add, as both arguments have two flavors:
URL can be absolute, or can begin with ./|../ and thus names the
submodule's origin relative to the superproject's origin.
Note: With this patch, "submodule add" discerns an absolute URL as
matching /*|*:*: e.g., URL begins with /, or it contains a :. This works
for all valid URLs, an absolute path in POSIX, as well as an absolute path
on Windows).
path can either already exist as a valid git repo, or will be cloned from
the given URL. The first form here eases creation of a new submodule in
an existing superproject as the submodule can be added and tested in-tree
before pushing to the public repository. However, the more usual form is
the second, where the repo is cloned from the given URL.
This specifically addresses the issue of
$ git submodule add a/b/c
attempting to clone from a repository at "a/b/c" to create a new module
in "c". This also simplifies description of "relative URL" as there is now
exactly *one* form: a URL relative to the parent's origin repo.
Signed-off-by: Mark Levedahl <mlevedahl@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years ago
|
|
|
if test -z "$repo" -o -z "$path"; then
|
|
|
|
usage
|
|
|
|
fi
|
|
|
|
|
git-submodule - make "submodule add" more strict, and document it
This change makes "submodule add" much more strict in the arguments it
takes, and is intended to address confusion as recently noted on the
git-list. With this change, the required syntax is:
$ git submodule add URL path
Specifically, this eliminates the form
$ git submodule add URL
which was confused by more than one person as
$ git submodule add path
With this patch, the URL locating the submodule's origin repository can be
either an absolute URL, or (if it begins with ./ or ../) can express the
submodule's repository location relative to the superproject's origin.
This patch also eliminates a third form of URL, which was relative to the
superproject's top-level directory (not its repository). Any URL that was
neither absolute nor matched ./*|../* was assumed to point to a
subdirectory of the superproject as the location of the submodule's origin
repository. This URL form was confusing and does not seem to correspond
to an important use-case. Specifically, no-one has identified the need to
clone from a repository already in the superproject's tree, but if this is
needed it is easily done using an absolute URL: $(pwd)/relative-path. So,
no functionality is lost with this patch. (t6008-rev-list-submodule.sh did
rely upon this relative URL, fixed by using $(pwd).)
Following this change, there are exactly four variants of
submodule-add, as both arguments have two flavors:
URL can be absolute, or can begin with ./|../ and thus names the
submodule's origin relative to the superproject's origin.
Note: With this patch, "submodule add" discerns an absolute URL as
matching /*|*:*: e.g., URL begins with /, or it contains a :. This works
for all valid URLs, an absolute path in POSIX, as well as an absolute path
on Windows).
path can either already exist as a valid git repo, or will be cloned from
the given URL. The first form here eases creation of a new submodule in
an existing superproject as the submodule can be added and tested in-tree
before pushing to the public repository. However, the more usual form is
the second, where the repo is cloned from the given URL.
This specifically addresses the issue of
$ git submodule add a/b/c
attempting to clone from a repository at "a/b/c" to create a new module
in "c". This also simplifies description of "relative URL" as there is now
exactly *one* form: a URL relative to the parent's origin repo.
Signed-off-by: Mark Levedahl <mlevedahl@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years ago
|
|
|
# assure repo is absolute or relative to parent
|
|
|
|
case "$repo" in
|
|
|
|
./*|../*)
|
|
|
|
# dereference source url relative to parent's url
|
|
|
|
realrepo=$(resolve_relative_url "$repo") || exit
|
|
|
|
;;
|
|
|
|
*:*|/*)
|
|
|
|
# absolute url
|
|
|
|
realrepo=$repo
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
die "$(eval_gettext "repo URL: '\$repo' must be absolute or begin with ./|../")"
|
git-submodule - make "submodule add" more strict, and document it
This change makes "submodule add" much more strict in the arguments it
takes, and is intended to address confusion as recently noted on the
git-list. With this change, the required syntax is:
$ git submodule add URL path
Specifically, this eliminates the form
$ git submodule add URL
which was confused by more than one person as
$ git submodule add path
With this patch, the URL locating the submodule's origin repository can be
either an absolute URL, or (if it begins with ./ or ../) can express the
submodule's repository location relative to the superproject's origin.
This patch also eliminates a third form of URL, which was relative to the
superproject's top-level directory (not its repository). Any URL that was
neither absolute nor matched ./*|../* was assumed to point to a
subdirectory of the superproject as the location of the submodule's origin
repository. This URL form was confusing and does not seem to correspond
to an important use-case. Specifically, no-one has identified the need to
clone from a repository already in the superproject's tree, but if this is
needed it is easily done using an absolute URL: $(pwd)/relative-path. So,
no functionality is lost with this patch. (t6008-rev-list-submodule.sh did
rely upon this relative URL, fixed by using $(pwd).)
Following this change, there are exactly four variants of
submodule-add, as both arguments have two flavors:
URL can be absolute, or can begin with ./|../ and thus names the
submodule's origin relative to the superproject's origin.
Note: With this patch, "submodule add" discerns an absolute URL as
matching /*|*:*: e.g., URL begins with /, or it contains a :. This works
for all valid URLs, an absolute path in POSIX, as well as an absolute path
on Windows).
path can either already exist as a valid git repo, or will be cloned from
the given URL. The first form here eases creation of a new submodule in
an existing superproject as the submodule can be added and tested in-tree
before pushing to the public repository. However, the more usual form is
the second, where the repo is cloned from the given URL.
This specifically addresses the issue of
$ git submodule add a/b/c
attempting to clone from a repository at "a/b/c" to create a new module
in "c". This also simplifies description of "relative URL" as there is now
exactly *one* form: a URL relative to the parent's origin repo.
Signed-off-by: Mark Levedahl <mlevedahl@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years ago
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
|
|
|
# normalize path:
|
|
|
|
# multiple //; leading ./; /./; /../; trailing /
|
|
|
|
path=$(printf '%s/\n' "$path" |
|
|
|
|
sed -e '
|
|
|
|
s|//*|/|g
|
|
|
|
s|^\(\./\)*||
|
|
|
|
s|/\./|/|g
|
|
|
|
:start
|
|
|
|
s|\([^/]*\)/\.\./||
|
|
|
|
tstart
|
|
|
|
s|/*$||
|
|
|
|
')
|
|
|
|
git ls-files --error-unmatch "$path" > /dev/null 2>&1 &&
|
|
|
|
die "$(eval_gettext "'\$path' already exists in the index")"
|
|
|
|
|
|
|
|
if test -z "$force" && ! git add --dry-run --ignore-missing "$path" > /dev/null 2>&1
|
|
|
|
then
|
|
|
|
eval_gettextln "The following path is ignored by one of your .gitignore files:
|
|
|
|
\$path
|
|
|
|
Use -f if you really want to add it." >&2
|
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
|
|
|
|
# perhaps the path exists and is already a git repo, else clone it
|
|
|
|
if test -e "$path"
|
|
|
|
then
|
|
|
|
if test -d "$path"/.git -o -f "$path"/.git
|
|
|
|
then
|
|
|
|
eval_gettextln "Adding existing repo at '\$path' to the index"
|
|
|
|
else
|
|
|
|
die "$(eval_gettext "'\$path' already exists and is not a valid git repo")"
|
|
|
|
fi
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
module_clone "$path" "$realrepo" "$reference" || exit
|
|
|
|
(
|
|
|
|
clear_local_git_env
|
|
|
|
cd "$path" &&
|
|
|
|
# ash fails to wordsplit ${branch:+-b "$branch"...}
|
|
|
|
case "$branch" in
|
|
|
|
'') git checkout -f -q ;;
|
|
|
|
?*) git checkout -f -q -B "$branch" "origin/$branch" ;;
|
|
|
|
esac
|
|
|
|
) || die "$(eval_gettext "Unable to checkout submodule '\$path'")"
|
|
|
|
fi
|
|
|
|
git config submodule."$path".url "$realrepo"
|
|
|
|
|
|
|
|
git add $force "$path" ||
|
|
|
|
die "$(eval_gettext "Failed to add submodule '\$path'")"
|
|
|
|
|
|
|
|
git config -f .gitmodules submodule."$path".path "$path" &&
|
|
|
|
git config -f .gitmodules submodule."$path".url "$repo" &&
|
|
|
|
git add --force .gitmodules ||
|
|
|
|
die "$(eval_gettext "Failed to register submodule '\$path'")"
|
|
|
|
}
|
|
|
|
|
|
|
|
#
|
|
|
|
# Execute an arbitrary command sequence in each checked out
|
|
|
|
# submodule
|
|
|
|
#
|
|
|
|
# $@ = command to execute
|
|
|
|
#
|
|
|
|
cmd_foreach()
|
|
|
|
{
|
|
|
|
# parse $args after "submodule ... foreach".
|
|
|
|
while test $# -ne 0
|
|
|
|
do
|
|
|
|
case "$1" in
|
|
|
|
-q|--quiet)
|
|
|
|
GIT_QUIET=1
|
|
|
|
;;
|
|
|
|
--recursive)
|
|
|
|
recursive=1
|
|
|
|
;;
|
|
|
|
-*)
|
|
|
|
usage
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
break
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
shift
|
|
|
|
done
|
|
|
|
|
|
|
|
toplevel=$(pwd)
|
|
|
|
|
|
|
|
# dup stdin so that it can be restored when running the external
|
|
|
|
# command in the subshell (and a recursive call to this function)
|
|
|
|
exec 3<&0
|
|
|
|
|
|
|
|
module_list |
|
|
|
|
while read mode sha1 stage path
|
|
|
|
do
|
|
|
|
if test -e "$path"/.git
|
|
|
|
then
|
|
|
|
say "$(eval_gettext "Entering '\$prefix\$path'")"
|
|
|
|
name=$(module_name "$path")
|
|
|
|
(
|
|
|
|
prefix="$prefix$path/"
|
|
|
|
clear_local_git_env
|
|
|
|
cd "$path" &&
|
|
|
|
eval "$@" &&
|
|
|
|
if test -n "$recursive"
|
|
|
|
then
|
|
|
|
cmd_foreach "--recursive" "$@"
|
|
|
|
fi
|
|
|
|
) <&3 3<&- ||
|
|
|
|
die "$(eval_gettext "Stopping at '\$path'; script returned non-zero status.")"
|
|
|
|
fi
|
|
|
|
done
|
|
|
|
}
|
|
|
|
|
|
|
|
#
|
|
|
|
# Register submodules in .git/config
|
|
|
|
#
|
|
|
|
# $@ = requested paths (default to all)
|
|
|
|
#
|
|
|
|
cmd_init()
|
|
|
|
{
|
|
|
|
# parse $args after "submodule ... init".
|
|
|
|
while test $# -ne 0
|
|
|
|
do
|
|
|
|
case "$1" in
|
|
|
|
-q|--quiet)
|
|
|
|
GIT_QUIET=1
|
|
|
|
;;
|
|
|
|
--)
|
|
|
|
shift
|
|
|
|
break
|
|
|
|
;;
|
|
|
|
-*)
|
|
|
|
usage
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
break
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
shift
|
|
|
|
done
|
|
|
|
|
|
|
|
module_list "$@" |
|
|
|
|
while read mode sha1 stage path
|
|
|
|
do
|
|
|
|
# Skip already registered paths
|
|
|
|
name=$(module_name "$path") || exit
|
|
|
|
if test -z "$(git config "submodule.$name.url")"
|
|
|
|
then
|
|
|
|
url=$(git config -f .gitmodules submodule."$name".url)
|
|
|
|
test -z "$url" &&
|
|
|
|
die "$(eval_gettext "No url found for submodule path '\$path' in .gitmodules")"
|
|
|
|
|
|
|
|
# Possibly a url relative to parent
|
|
|
|
case "$url" in
|
|
|
|
./*|../*)
|
|
|
|
url=$(resolve_relative_url "$url") || exit
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
git config submodule."$name".url "$url" ||
|
|
|
|
die "$(eval_gettext "Failed to register url for submodule path '\$path'")"
|
|
|
|
fi
|
|
|
|
|
|
|
|
# Copy "update" setting when it is not set yet
|
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>
16 years ago
|
|
|
upd="$(git config -f .gitmodules submodule."$name".update)"
|
|
|
|
test -z "$upd" ||
|
|
|
|
test -n "$(git config submodule."$name".update)" ||
|
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>
16 years ago
|
|
|
git config submodule."$name".update "$upd" ||
|
|
|
|
die "$(eval_gettext "Failed to register update mode for submodule path '\$path'")"
|
|
|
|
|
|
|
|
say "$(eval_gettext "Submodule '\$name' (\$url) registered for path '\$path'")"
|
|
|
|
done
|
|
|
|
}
|
|
|
|
|
|
|
|
#
|
|
|
|
# Update each submodule path to correct revision, using clone and checkout as needed
|
|
|
|
#
|
|
|
|
# $@ = requested paths (default to all)
|
|
|
|
#
|
|
|
|
cmd_update()
|
|
|
|
{
|
|
|
|
# parse $args after "submodule ... update".
|
|
|
|
orig_flags=
|
|
|
|
while test $# -ne 0
|
|
|
|
do
|
|
|
|
case "$1" in
|
|
|
|
-q|--quiet)
|
|
|
|
GIT_QUIET=1
|
|
|
|
;;
|
|
|
|
-i|--init)
|
|
|
|
init=1
|
|
|
|
;;
|
|
|
|
-N|--no-fetch)
|
|
|
|
nofetch=1
|
|
|
|
;;
|
|
|
|
-f|--force)
|
|
|
|
force=$1
|
|
|
|
;;
|
|
|
|
-r|--rebase)
|
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>
16 years ago
|
|
|
update="rebase"
|
|
|
|
;;
|
|
|
|
--reference)
|
|
|
|
case "$2" in '') usage ;; esac
|
|
|
|
reference="--reference=$2"
|
|
|
|
orig_flags="$orig_flags $(git rev-parse --sq-quote "$1")"
|
|
|
|
shift
|
|
|
|
;;
|
|
|
|
--reference=*)
|
|
|
|
reference="$1"
|
|
|
|
;;
|
|
|
|
-m|--merge)
|
|
|
|
update="merge"
|
|
|
|
;;
|
|
|
|
--recursive)
|
|
|
|
recursive=1
|
|
|
|
;;
|
|
|
|
--checkout)
|
|
|
|
update="checkout"
|
|
|
|
;;
|
|
|
|
--)
|
|
|
|
shift
|
|
|
|
break
|
|
|
|
;;
|
|
|
|
-*)
|
|
|
|
usage
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
break
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
orig_flags="$orig_flags $(git rev-parse --sq-quote "$1")"
|
|
|
|
shift
|
|
|
|
done
|
|
|
|
|
|
|
|
if test -n "$init"
|
|
|
|
then
|
|
|
|
cmd_init "--" "$@" || return
|
|
|
|
fi
|
|
|
|
|
|
|
|
cloned_modules=
|
|
|
|
module_list "$@" | {
|
|
|
|
err=
|
|
|
|
while read mode sha1 stage path
|
|
|
|
do
|
submodule: process conflicting submodules only once
During a merge module_list returns conflicting submodules several times
(stage 1,2,3) which caused the submodules to be used multiple times in
git submodule init, sync, update and status command.
There are 5 callers of module_list; they all read (mode, sha1, stage,
path) tuple, and most of them care only about path. As a first level
approximation, it should be Ok (in the sense that it does not make things
worse than it currently is) to filter the duplicate paths from module_list
output, but some callers should change their behaviour when the merge in
the superproject still has conflicts.
Notice the higher-stage entries, and emit only one record from
module_list, but while doing so, mark the entry with "U" (not [0-3]) in
the $stage field and null out the SHA-1 part, as the object name for the
lowest stage does not give any useful information to the caller, and this
way any caller that uses the object name would hopefully barf. Then
update the codepaths for each subcommands this way:
- "update" should not touch the submodule repository, because we do not
know what commit should be checked out yet.
- "status" reports the conflicting submodules as 'U000...000' and does
not recurse into them (we might later want to make it recurse).
- The command called by "foreach" may want to do whatever it wants to do
by noticing the merged status in the superproject itself, so feed the
path to it from module_list as before, but only once per submodule.
- "init" and "sync" are unlikely things to do while the superproject is
still not merged, but as long as a submodule is there in $path, there
is no point skipping it. It might however want to take the merged
status of .gitmodules into account, but that is outside of the scope of
this topic.
Acked-by: Jens Lehmann <Jens.Lehmann@web.de>
Thanks-to: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Nicolas Morey-Chaisemartin <nicolas@morey-chaisemartin.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
14 years ago
|
|
|
if test "$stage" = U
|
|
|
|
then
|
|
|
|
echo >&2 "Skipping unmerged submodule $path"
|
|
|
|
continue
|
|
|
|
fi
|
|
|
|
name=$(module_name "$path") || exit
|
|
|
|
url=$(git config submodule."$name".url)
|
|
|
|
if ! test -z "$update"
|
|
|
|
then
|
|
|
|
update_module=$update
|
|
|
|
else
|
|
|
|
update_module=$(git config submodule."$name".update)
|
|
|
|
fi
|
|
|
|
|
|
|
|
if test "$update_module" = "none"
|
|
|
|
then
|
|
|
|
echo "Skipping submodule '$path'"
|
|
|
|
continue
|
|
|
|
fi
|
|
|
|
|
|
|
|
if test -z "$url"
|
|
|
|
then
|
|
|
|
# Only mention uninitialized submodules when its
|
|
|
|
# path have been specified
|
|
|
|
test "$#" != "0" &&
|
|
|
|
say "$(eval_gettext "Submodule path '\$path' not initialized
|
|
|
|
Maybe you want to use 'update --init'?")"
|
|
|
|
continue
|
|
|
|
fi
|
|
|
|
|
|
|
|
if ! test -d "$path"/.git -o -f "$path"/.git
|
|
|
|
then
|
|
|
|
module_clone "$path" "$url" "$reference"|| exit
|
|
|
|
cloned_modules="$cloned_modules;$name"
|
|
|
|
subsha1=
|
|
|
|
else
|
|
|
|
subsha1=$(clear_local_git_env; cd "$path" &&
|
|
|
|
git rev-parse --verify HEAD) ||
|
|
|
|
die "$(eval_gettext "Unable to find current revision in submodule path '\$path'")"
|
|
|
|
fi
|
|
|
|
|
|
|
|
if test "$subsha1" != "$sha1"
|
|
|
|
then
|
|
|
|
subforce=$force
|
|
|
|
# If we don't already have a -f flag and the submodule has never been checked out
|
|
|
|
if test -z "$subsha1" -a -z "$force"
|
|
|
|
then
|
|
|
|
subforce="-f"
|
|
|
|
fi
|
|
|
|
|
|
|
|
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
|
|
|
|
|
|
|
|
# Is this something we just cloned?
|
|
|
|
case ";$cloned_modules;" in
|
|
|
|
*";$name;"*)
|
|
|
|
# then there is no local change to integrate
|
|
|
|
update_module= ;;
|
|
|
|
esac
|
|
|
|
|
|
|
|
must_die_on_failure=
|
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>
16 years ago
|
|
|
case "$update_module" in
|
|
|
|
rebase)
|
|
|
|
command="git rebase"
|
|
|
|
die_msg="$(eval_gettext "Unable to rebase '\$sha1' in submodule path '\$path'")"
|
|
|
|
say_msg="$(eval_gettext "Submodule path '\$path': rebased into '\$sha1'")"
|
|
|
|
must_die_on_failure=yes
|
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>
16 years ago
|
|
|
;;
|
|
|
|
merge)
|
|
|
|
command="git merge"
|
|
|
|
die_msg="$(eval_gettext "Unable to merge '\$sha1' in submodule path '\$path'")"
|
|
|
|
say_msg="$(eval_gettext "Submodule path '\$path': merged in '\$sha1'")"
|
|
|
|
must_die_on_failure=yes
|
|
|
|
;;
|
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>
16 years ago
|
|
|
*)
|
|
|
|
command="git checkout $subforce -q"
|
|
|
|
die_msg="$(eval_gettext "Unable to checkout '\$sha1' in submodule path '\$path'")"
|
|
|
|
say_msg="$(eval_gettext "Submodule path '\$path': checked out '\$sha1'")"
|
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>
16 years ago
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
|
|
|
if (clear_local_git_env; cd "$path" && $command "$sha1")
|
|
|
|
then
|
|
|
|
say "$say_msg"
|
|
|
|
elif test -n "$must_die_on_failure"
|
|
|
|
then
|
|
|
|
die_with_status 2 "$die_msg"
|
|
|
|
else
|
|
|
|
err="${err};$die_msg"
|
|
|
|
continue
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
if test -n "$recursive"
|
|
|
|
then
|
|
|
|
(clear_local_git_env; cd "$path" && eval cmd_update "$orig_flags")
|
|
|
|
res=$?
|
|
|
|
if test $res -gt 0
|
|
|
|
then
|
|
|
|
die_msg="$(eval_gettext "Failed to recurse into submodule path '\$path'")"
|
|
|
|
if test $res -eq 1
|
|
|
|
then
|
|
|
|
err="${err};$die_msg"
|
|
|
|
continue
|
|
|
|
else
|
|
|
|
die_with_status $res "$die_msg"
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
done
|
|
|
|
|
|
|
|
if test -n "$err"
|
|
|
|
then
|
|
|
|
OIFS=$IFS
|
|
|
|
IFS=';'
|
|
|
|
for e in $err
|
|
|
|
do
|
|
|
|
if test -n "$e"
|
|
|
|
then
|
|
|
|
echo >&2 "$e"
|
|
|
|
fi
|
|
|
|
done
|
|
|
|
IFS=$OIFS
|
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
set_name_rev () {
|
|
|
|
revname=$( (
|
|
|
|
clear_local_git_env
|
|
|
|
cd "$1" && {
|
|
|
|
git describe "$2" 2>/dev/null ||
|
|
|
|
git describe --tags "$2" 2>/dev/null ||
|
|
|
|
git describe --contains "$2" 2>/dev/null ||
|
|
|
|
git describe --all --always "$2"
|
|
|
|
}
|
|
|
|
) )
|
|
|
|
test -z "$revname" || revname=" ($revname)"
|
|
|
|
}
|
|
|
|
#
|
|
|
|
# Show commit summary for submodules in index or working tree
|
|
|
|
#
|
|
|
|
# If '--cached' is given, show summary between index and given commit,
|
|
|
|
# or between working tree and given commit
|
|
|
|
#
|
|
|
|
# $@ = [commit (default 'HEAD'),] requested paths (default all)
|
|
|
|
#
|
|
|
|
cmd_summary() {
|
|
|
|
summary_limit=-1
|
|
|
|
for_status=
|
|
|
|
diff_cmd=diff-index
|
|
|
|
|
|
|
|
# parse $args after "submodule ... summary".
|
|
|
|
while test $# -ne 0
|
|
|
|
do
|
|
|
|
case "$1" in
|
|
|
|
--cached)
|
|
|
|
cached="$1"
|
|
|
|
;;
|
|
|
|
--files)
|
|
|
|
files="$1"
|
|
|
|
;;
|
|
|
|
--for-status)
|
|
|
|
for_status="$1"
|
|
|
|
;;
|
|
|
|
-n|--summary-limit)
|
|
|
|
if summary_limit=$(($2 + 0)) 2>/dev/null && test "$summary_limit" = "$2"
|
|
|
|
then
|
|
|
|
:
|
|
|
|
else
|
|
|
|
usage
|
|
|
|
fi
|
|
|
|
shift
|
|
|
|
;;
|
|
|
|
--)
|
|
|
|
shift
|
|
|
|
break
|
|
|
|
;;
|
|
|
|
-*)
|
|
|
|
usage
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
break
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
shift
|
|
|
|
done
|
|
|
|
|
|
|
|
test $summary_limit = 0 && return
|
|
|
|
|
|
|
|
if rev=$(git rev-parse -q --verify --default HEAD ${1+"$1"})
|
|
|
|
then
|
|
|
|
head=$rev
|
|
|
|
test $# = 0 || shift
|
|
|
|
elif test -z "$1" -o "$1" = "HEAD"
|
|
|
|
then
|
|
|
|
# before the first commit: compare with an empty tree
|
|
|
|
head=$(git hash-object -w -t tree --stdin </dev/null)
|
|
|
|
test -z "$1" || shift
|
|
|
|
else
|
|
|
|
head="HEAD"
|
|
|
|
fi
|
|
|
|
|
|
|
|
if [ -n "$files" ]
|
|
|
|
then
|
|
|
|
test -n "$cached" &&
|
|
|
|
die "$(gettext -- "--cached cannot be used with --files")"
|
|
|
|
diff_cmd=diff-files
|
|
|
|
head=
|
|
|
|
fi
|
|
|
|
|
|
|
|
cd_to_toplevel
|
|
|
|
# Get modified modules cared by user
|
|
|
|
modules=$(git $diff_cmd $cached --ignore-submodules=dirty --raw $head -- "$@" |
|
|
|
|
sane_egrep '^:([0-7]* )?160000' |
|
|
|
|
while read mod_src mod_dst sha1_src sha1_dst status name
|
|
|
|
do
|
|
|
|
# Always show modules deleted or type-changed (blob<->module)
|
|
|
|
test $status = D -o $status = T && echo "$name" && continue
|
|
|
|
# Also show added or modified modules which are checked out
|
|
|
|
GIT_DIR="$name/.git" git-rev-parse --git-dir >/dev/null 2>&1 &&
|
|
|
|
echo "$name"
|
|
|
|
done
|
|
|
|
)
|
|
|
|
|
|
|
|
test -z "$modules" && return
|
|
|
|
|
|
|
|
git $diff_cmd $cached --ignore-submodules=dirty --raw $head -- $modules |
|
|
|
|
sane_egrep '^:([0-7]* )?160000' |
|
|
|
|
cut -c2- |
|
|
|
|
while read mod_src mod_dst sha1_src sha1_dst status name
|
|
|
|
do
|
|
|
|
if test -z "$cached" &&
|
|
|
|
test $sha1_dst = 0000000000000000000000000000000000000000
|
|
|
|
then
|
|
|
|
case "$mod_dst" in
|
|
|
|
160000)
|
|
|
|
sha1_dst=$(GIT_DIR="$name/.git" git rev-parse HEAD)
|
|
|
|
;;
|
|
|
|
100644 | 100755 | 120000)
|
|
|
|
sha1_dst=$(git hash-object $name)
|
|
|
|
;;
|
|
|
|
000000)
|
|
|
|
;; # removed
|
|
|
|
*)
|
|
|
|
# unexpected type
|
|
|
|
eval_gettextln "unexpected mode \$mod_dst" >&2
|
|
|
|
continue ;;
|
|
|
|
esac
|
|
|
|
fi
|
|
|
|
missing_src=
|
|
|
|
missing_dst=
|
|
|
|
|
|
|
|
test $mod_src = 160000 &&
|
|
|
|
! GIT_DIR="$name/.git" git-rev-parse -q --verify $sha1_src^0 >/dev/null &&
|
|
|
|
missing_src=t
|
|
|
|
|
|
|
|
test $mod_dst = 160000 &&
|
|
|
|
! GIT_DIR="$name/.git" git-rev-parse -q --verify $sha1_dst^0 >/dev/null &&
|
|
|
|
missing_dst=t
|
|
|
|
|
|
|
|
total_commits=
|
|
|
|
case "$missing_src,$missing_dst" in
|
|
|
|
t,)
|
|
|
|
errmsg="$(eval_gettext " Warn: \$name doesn't contain commit \$sha1_src")"
|
|
|
|
;;
|
|
|
|
,t)
|
|
|
|
errmsg="$(eval_gettext " Warn: \$name doesn't contain commit \$sha1_dst")"
|
|
|
|
;;
|
|
|
|
t,t)
|
|
|
|
errmsg="$(eval_gettext " Warn: \$name doesn't contain commits \$sha1_src and \$sha1_dst")"
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
errmsg=
|
|
|
|
total_commits=$(
|
|
|
|
if test $mod_src = 160000 -a $mod_dst = 160000
|
|
|
|
then
|
|
|
|
range="$sha1_src...$sha1_dst"
|
|
|
|
elif test $mod_src = 160000
|
|
|
|
then
|
|
|
|
range=$sha1_src
|
|
|
|
else
|
|
|
|
range=$sha1_dst
|
|
|
|
fi
|
|
|
|
GIT_DIR="$name/.git" \
|
|
|
|
git rev-list --first-parent $range -- | wc -l
|
|
|
|
)
|
|
|
|
total_commits=" ($(($total_commits + 0)))"
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
|
|
|
sha1_abbr_src=$(echo $sha1_src | cut -c1-7)
|
|
|
|
sha1_abbr_dst=$(echo $sha1_dst | cut -c1-7)
|
|
|
|
if test $status = T
|
|
|
|
then
|
|
|
|
blob="$(gettext "blob")"
|
|
|
|
submodule="$(gettext "submodule")"
|
|
|
|
if test $mod_dst = 160000
|
|
|
|
then
|
|
|
|
echo "* $name $sha1_abbr_src($blob)->$sha1_abbr_dst($submodule)$total_commits:"
|
|
|
|
else
|
|
|
|
echo "* $name $sha1_abbr_src($submodule)->$sha1_abbr_dst($blob)$total_commits:"
|
|
|
|
fi
|
|
|
|
else
|
|
|
|
echo "* $name $sha1_abbr_src...$sha1_abbr_dst$total_commits:"
|
|
|
|
fi
|
|
|
|
if test -n "$errmsg"
|
|
|
|
then
|
|
|
|
# Don't give error msg for modification whose dst is not submodule
|
|
|
|
# i.e. deleted or changed to blob
|
|
|
|
test $mod_dst = 160000 && echo "$errmsg"
|
|
|
|
else
|
|
|
|
if test $mod_src = 160000 -a $mod_dst = 160000
|
|
|
|
then
|
|
|
|
limit=
|
|
|
|
test $summary_limit -gt 0 && limit="-$summary_limit"
|
|
|
|
GIT_DIR="$name/.git" \
|
|
|
|
git log $limit --pretty='format: %m %s' \
|
|
|
|
--first-parent $sha1_src...$sha1_dst
|
|
|
|
elif test $mod_dst = 160000
|
|
|
|
then
|
|
|
|
GIT_DIR="$name/.git" \
|
|
|
|
git log --pretty='format: > %s' -1 $sha1_dst
|
|
|
|
else
|
|
|
|
GIT_DIR="$name/.git" \
|
|
|
|
git log --pretty='format: < %s' -1 $sha1_src
|
|
|
|
fi
|
|
|
|
echo
|
|
|
|
fi
|
|
|
|
echo
|
|
|
|
done |
|
|
|
|
if test -n "$for_status"; then
|
|
|
|
if [ -n "$files" ]; then
|
|
|
|
gettextln "# Submodules changed but not updated:"
|
|
|
|
else
|
|
|
|
gettextln "# Submodule changes to be committed:"
|
|
|
|
fi
|
|
|
|
echo "#"
|
|
|
|
sed -e 's|^|# |' -e 's|^# $|#|'
|
|
|
|
else
|
|
|
|
cat
|
|
|
|
fi
|
|
|
|
}
|
|
|
|
#
|
|
|
|
# List all submodules, prefixed with:
|
|
|
|
# - submodule not initialized
|
|
|
|
# + different revision checked out
|
|
|
|
#
|
|
|
|
# If --cached was specified the revision in the index will be printed
|
|
|
|
# instead of the currently checked out revision.
|
|
|
|
#
|
|
|
|
# $@ = requested paths (default to all)
|
|
|
|
#
|
|
|
|
cmd_status()
|
|
|
|
{
|
|
|
|
# parse $args after "submodule ... status".
|
|
|
|
orig_flags=
|
|
|
|
while test $# -ne 0
|
|
|
|
do
|
|
|
|
case "$1" in
|
|
|
|
-q|--quiet)
|
|
|
|
GIT_QUIET=1
|
|
|
|
;;
|
|
|
|
--cached)
|
|
|
|
cached=1
|
|
|
|
;;
|
|
|
|
--recursive)
|
|
|
|
recursive=1
|
|
|
|
;;
|
|
|
|
--)
|
|
|
|
shift
|
|
|
|
break
|
|
|
|
;;
|
|
|
|
-*)
|
|
|
|
usage
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
break
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
orig_flags="$orig_flags $(git rev-parse --sq-quote "$1")"
|
|
|
|
shift
|
|
|
|
done
|
|
|
|
|
|
|
|
module_list "$@" |
|
|
|
|
while read mode sha1 stage path
|
|
|
|
do
|
|
|
|
name=$(module_name "$path") || exit
|
|
|
|
url=$(git config submodule."$name".url)
|
|
|
|
displaypath="$prefix$path"
|
submodule: process conflicting submodules only once
During a merge module_list returns conflicting submodules several times
(stage 1,2,3) which caused the submodules to be used multiple times in
git submodule init, sync, update and status command.
There are 5 callers of module_list; they all read (mode, sha1, stage,
path) tuple, and most of them care only about path. As a first level
approximation, it should be Ok (in the sense that it does not make things
worse than it currently is) to filter the duplicate paths from module_list
output, but some callers should change their behaviour when the merge in
the superproject still has conflicts.
Notice the higher-stage entries, and emit only one record from
module_list, but while doing so, mark the entry with "U" (not [0-3]) in
the $stage field and null out the SHA-1 part, as the object name for the
lowest stage does not give any useful information to the caller, and this
way any caller that uses the object name would hopefully barf. Then
update the codepaths for each subcommands this way:
- "update" should not touch the submodule repository, because we do not
know what commit should be checked out yet.
- "status" reports the conflicting submodules as 'U000...000' and does
not recurse into them (we might later want to make it recurse).
- The command called by "foreach" may want to do whatever it wants to do
by noticing the merged status in the superproject itself, so feed the
path to it from module_list as before, but only once per submodule.
- "init" and "sync" are unlikely things to do while the superproject is
still not merged, but as long as a submodule is there in $path, there
is no point skipping it. It might however want to take the merged
status of .gitmodules into account, but that is outside of the scope of
this topic.
Acked-by: Jens Lehmann <Jens.Lehmann@web.de>
Thanks-to: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Nicolas Morey-Chaisemartin <nicolas@morey-chaisemartin.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
14 years ago
|
|
|
if test "$stage" = U
|
|
|
|
then
|
|
|
|
say "U$sha1 $displaypath"
|
|
|
|
continue
|
|
|
|
fi
|
|
|
|
if test -z "$url" || ! test -d "$path"/.git -o -f "$path"/.git
|
|
|
|
then
|
|
|
|
say "-$sha1 $displaypath"
|
|
|
|
continue;
|
|
|
|
fi
|
|
|
|
set_name_rev "$path" "$sha1"
|
|
|
|
if git diff-files --ignore-submodules=dirty --quiet -- "$path"
|
|
|
|
then
|
|
|
|
say " $sha1 $displaypath$revname"
|
|
|
|
else
|
|
|
|
if test -z "$cached"
|
|
|
|
then
|
|
|
|
sha1=$(clear_local_git_env; cd "$path" && git rev-parse --verify HEAD)
|
|
|
|
set_name_rev "$path" "$sha1"
|
|
|
|
fi
|
|
|
|
say "+$sha1 $displaypath$revname"
|
|
|
|
fi
|
|
|
|
|
|
|
|
if test -n "$recursive"
|
|
|
|
then
|
|
|
|
(
|
|
|
|
prefix="$displaypath/"
|
|
|
|
clear_local_git_env
|
|
|
|
cd "$path" &&
|
|
|
|
eval cmd_status "$orig_args"
|
|
|
|
) ||
|
|
|
|
die "$(eval_gettext "Failed to recurse into submodule path '\$path'")"
|
|
|
|
fi
|
|
|
|
done
|
|
|
|
}
|
|
|
|
#
|
|
|
|
# Sync remote urls for submodules
|
|
|
|
# This makes the value for remote.$remote.url match the value
|
|
|
|
# specified in .gitmodules.
|
|
|
|
#
|
|
|
|
cmd_sync()
|
|
|
|
{
|
|
|
|
while test $# -ne 0
|
|
|
|
do
|
|
|
|
case "$1" in
|
|
|
|
-q|--quiet)
|
|
|
|
GIT_QUIET=1
|
|
|
|
shift
|
|
|
|
;;
|
|
|
|
--)
|
|
|
|
shift
|
|
|
|
break
|
|
|
|
;;
|
|
|
|
-*)
|
|
|
|
usage
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
break
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
done
|
|
|
|
cd_to_toplevel
|
|
|
|
module_list "$@" |
|
|
|
|
while read mode sha1 stage path
|
|
|
|
do
|
|
|
|
name=$(module_name "$path")
|
|
|
|
url=$(git config -f .gitmodules --get submodule."$name".url)
|
|
|
|
|
|
|
|
# Possibly a url relative to parent
|
|
|
|
case "$url" in
|
|
|
|
./*|../*)
|
|
|
|
url=$(resolve_relative_url "$url") || exit
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
|
|
|
if git config "submodule.$name.url" >/dev/null 2>/dev/null
|
|
|
|
then
|
|
|
|
say "$(eval_gettext "Synchronizing submodule url for '\$name'")"
|
|
|
|
git config submodule."$name".url "$url"
|
|
|
|
|
|
|
|
if test -e "$path"/.git
|
|
|
|
then
|
|
|
|
(
|
|
|
|
clear_local_git_env
|
|
|
|
cd "$path"
|
|
|
|
remote=$(get_default_remote)
|
|
|
|
git config remote."$remote".url "$url"
|
|
|
|
)
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
done
|
|
|
|
}
|
|
|
|
|
|
|
|
# This loop parses the command line arguments to find the
|
|
|
|
# subcommand name to dispatch. Parsing of the subcommand specific
|
|
|
|
# options are primarily done by the subcommand implementations.
|
|
|
|
# Subcommand specific options such as --branch and --cached are
|
|
|
|
# parsed here as well, for backward compatibility.
|
|
|
|
|
|
|
|
while test $# != 0 && test -z "$command"
|
|
|
|
do
|
|
|
|
case "$1" in
|
|
|
|
add | foreach | init | update | status | summary | sync)
|
|
|
|
command=$1
|
|
|
|
;;
|
|
|
|
-q|--quiet)
|
|
|
|
GIT_QUIET=1
|
|
|
|
;;
|
|
|
|
-b|--branch)
|
|
|
|
case "$2" in
|
|
|
|
'')
|
|
|
|
usage
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
branch="$2"; shift
|
|
|
|
;;
|
|
|
|
--cached)
|
|
|
|
cached="$1"
|
|
|
|
;;
|
|
|
|
--)
|
|
|
|
break
|
|
|
|
;;
|
|
|
|
-*)
|
|
|
|
usage
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
break
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
shift
|
|
|
|
done
|
|
|
|
|
|
|
|
# No command word defaults to "status"
|
|
|
|
test -n "$command" || command=status
|
|
|
|
|
|
|
|
# "-b branch" is accepted only by "add"
|
|
|
|
if test -n "$branch" && test "$command" != add
|
|
|
|
then
|
|
|
|
usage
|
|
|
|
fi
|
|
|
|
|
|
|
|
# "--cached" is accepted only by "status" and "summary"
|
|
|
|
if test -n "$cached" && test "$command" != status -a "$command" != summary
|
|
|
|
then
|
|
|
|
usage
|
|
|
|
fi
|
|
|
|
|
|
|
|
"cmd_$command" "$@"
|