2007-05-26 13:56:40 +00:00
|
|
|
#!/bin/sh
|
|
|
|
#
|
2007-06-24 21:06:07 +00:00
|
|
|
# git-submodules.sh: add, init, update or list git submodules
|
2007-05-26 13:56:40 +00:00
|
|
|
#
|
|
|
|
# Copyright (c) 2007 Lars Hjemli
|
|
|
|
|
2007-06-24 21:06:07 +00:00
|
|
|
USAGE='[--quiet] [--cached] [add <repo> [-b branch]|status|init|update] [--] [<path>...]'
|
2007-11-06 09:50:02 +00:00
|
|
|
OPTIONS_SPEC=
|
2007-05-26 13:56:40 +00:00
|
|
|
. git-sh-setup
|
|
|
|
require_work_tree
|
|
|
|
|
2008-01-15 10:48:45 +00:00
|
|
|
command=
|
2007-06-24 21:06:07 +00:00
|
|
|
branch=
|
2007-05-26 13:56:40 +00:00
|
|
|
quiet=
|
|
|
|
cached=
|
|
|
|
|
|
|
|
#
|
|
|
|
# print stuff on stdout unless -q was specified
|
|
|
|
#
|
|
|
|
say()
|
|
|
|
{
|
|
|
|
if test -z "$quiet"
|
|
|
|
then
|
|
|
|
echo "$@"
|
|
|
|
fi
|
|
|
|
}
|
|
|
|
|
2007-06-24 21:06:07 +00:00
|
|
|
# NEEDSWORK: identical function exists in get_repo_base in clone.sh
|
|
|
|
get_repo_base() {
|
|
|
|
(
|
|
|
|
cd "`/bin/pwd`" &&
|
|
|
|
cd "$1" || cd "$1.git" &&
|
|
|
|
{
|
|
|
|
cd .git
|
|
|
|
pwd
|
|
|
|
}
|
|
|
|
) 2>/dev/null
|
|
|
|
}
|
|
|
|
|
2007-09-24 02:19:42 +00:00
|
|
|
# Resolve relative url by appending to parent's url
|
|
|
|
resolve_relative_url ()
|
|
|
|
{
|
|
|
|
branch="$(git symbolic-ref HEAD 2>/dev/null)"
|
|
|
|
remote="$(git config branch.${branch#refs/heads/}.remote)"
|
|
|
|
remote="${remote:-origin}"
|
|
|
|
remoteurl="$(git config remote.$remote.url)" ||
|
|
|
|
die "remote ($remote) does not have a url in .git/config"
|
|
|
|
url="$1"
|
|
|
|
while test -n "$url"
|
|
|
|
do
|
|
|
|
case "$url" in
|
|
|
|
../*)
|
|
|
|
url="${url#../}"
|
|
|
|
remoteurl="${remoteurl%/*}"
|
|
|
|
;;
|
|
|
|
./*)
|
|
|
|
url="${url#./}"
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
break;;
|
|
|
|
esac
|
|
|
|
done
|
|
|
|
echo "$remoteurl/$url"
|
|
|
|
}
|
|
|
|
|
2007-06-11 19:12:24 +00:00
|
|
|
#
|
|
|
|
# Map submodule path to submodule name
|
|
|
|
#
|
|
|
|
# $1 = path
|
|
|
|
#
|
|
|
|
module_name()
|
|
|
|
{
|
2007-07-25 22:51:26 +00:00
|
|
|
# Do we have "submodule.<something>.path = $1" defined in .gitmodules file?
|
2007-11-08 21:48:49 +00:00
|
|
|
re=$(printf '%s' "$1" | sed -e 's/[].[^$\\*]/\\&/g')
|
2007-07-25 22:51:26 +00:00
|
|
|
name=$( GIT_CONFIG=.gitmodules \
|
|
|
|
git config --get-regexp '^submodule\..*\.path$' |
|
|
|
|
sed -n -e 's|^submodule\.\(.*\)\.path '"$re"'$|\1|p' )
|
2007-06-11 19:12:24 +00:00
|
|
|
test -z "$name" &&
|
|
|
|
die "No submodule mapping found in .gitmodules for path '$path'"
|
|
|
|
echo "$name"
|
|
|
|
}
|
2007-06-06 09:13:01 +00:00
|
|
|
|
|
|
|
#
|
|
|
|
# Clone a submodule
|
|
|
|
#
|
2008-01-15 10:35:49 +00:00
|
|
|
# Prior to calling, cmd_update checks that a possibly existing
|
2007-06-24 21:06:07 +00:00
|
|
|
# path is not a git repository.
|
2008-01-15 10:35:49 +00:00
|
|
|
# Likewise, cmd_add checks that path does not exist at all,
|
2007-06-24 21:06:07 +00:00
|
|
|
# since it is the location of a new submodule.
|
|
|
|
#
|
2007-06-06 09:13:01 +00:00
|
|
|
module_clone()
|
|
|
|
{
|
|
|
|
path=$1
|
|
|
|
url=$2
|
|
|
|
|
|
|
|
# If there already is a directory at the submodule path,
|
|
|
|
# expect it to be empty (since that is the default checkout
|
|
|
|
# action) and try to remove it.
|
|
|
|
# Note: if $path is a symlink to a directory the test will
|
|
|
|
# succeed but the rmdir will fail. We might want to fix this.
|
|
|
|
if test -d "$path"
|
|
|
|
then
|
|
|
|
rmdir "$path" 2>/dev/null ||
|
|
|
|
die "Directory '$path' exist, but is neither empty nor a git repository"
|
|
|
|
fi
|
|
|
|
|
|
|
|
test -e "$path" &&
|
|
|
|
die "A file already exist at path '$path'"
|
|
|
|
|
|
|
|
git-clone -n "$url" "$path" ||
|
2007-06-11 19:12:24 +00:00
|
|
|
die "Clone of '$url' into submodule path '$path' failed"
|
2007-06-06 09:13:01 +00:00
|
|
|
}
|
|
|
|
|
2007-06-24 21:06:07 +00:00
|
|
|
#
|
|
|
|
# Add a new submodule to the working tree, .gitmodules and the index
|
|
|
|
#
|
|
|
|
# $@ = repo [path]
|
|
|
|
#
|
|
|
|
# optional branch is stored in global branch variable
|
|
|
|
#
|
2008-01-15 10:35:49 +00:00
|
|
|
cmd_add()
|
2007-06-24 21:06:07 +00:00
|
|
|
{
|
2008-01-15 10:48:45 +00:00
|
|
|
# parse $args after "submodule ... add".
|
|
|
|
while test $# -ne 0
|
|
|
|
do
|
|
|
|
case "$1" in
|
|
|
|
-b | --branch)
|
|
|
|
case "$2" in '') usage ;; esac
|
|
|
|
branch=$2
|
|
|
|
shift
|
|
|
|
;;
|
|
|
|
-q|--quiet)
|
|
|
|
quiet=1
|
|
|
|
;;
|
|
|
|
--)
|
|
|
|
shift
|
|
|
|
break
|
|
|
|
;;
|
|
|
|
-*)
|
|
|
|
usage
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
break
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
shift
|
|
|
|
done
|
|
|
|
|
2007-06-24 21:06:07 +00:00
|
|
|
repo=$1
|
|
|
|
path=$2
|
|
|
|
|
|
|
|
if test -z "$repo"; then
|
|
|
|
usage
|
|
|
|
fi
|
|
|
|
|
2007-09-24 02:19:42 +00:00
|
|
|
case "$repo" in
|
|
|
|
./*|../*)
|
|
|
|
# dereference source url relative to parent's url
|
|
|
|
realrepo="$(resolve_relative_url $repo)" ;;
|
|
|
|
*)
|
|
|
|
# Turn the source into an absolute path if
|
|
|
|
# it is local
|
|
|
|
if base=$(get_repo_base "$repo"); then
|
|
|
|
repo="$base"
|
|
|
|
fi
|
2007-09-29 23:39:54 +00:00
|
|
|
realrepo=$repo
|
2007-09-24 02:19:42 +00:00
|
|
|
;;
|
|
|
|
esac
|
2007-06-24 21:06:07 +00:00
|
|
|
|
|
|
|
# Guess path from repo if not specified or strip trailing slashes
|
|
|
|
if test -z "$path"; then
|
|
|
|
path=$(echo "$repo" | sed -e 's|/*$||' -e 's|:*/*\.git$||' -e 's|.*[/:]||g')
|
|
|
|
else
|
|
|
|
path=$(echo "$path" | sed -e 's|/*$||')
|
|
|
|
fi
|
|
|
|
|
|
|
|
test -e "$path" &&
|
|
|
|
die "'$path' already exists"
|
|
|
|
|
2007-07-03 05:52:14 +00:00
|
|
|
git ls-files --error-unmatch "$path" > /dev/null 2>&1 &&
|
2007-06-24 21:06:07 +00:00
|
|
|
die "'$path' already exists in the index"
|
|
|
|
|
2007-09-24 02:19:42 +00:00
|
|
|
module_clone "$path" "$realrepo" || exit
|
2007-12-04 22:45:16 +00:00
|
|
|
(unset GIT_DIR; cd "$path" && git checkout -q ${branch:+-b "$branch" "origin/$branch"}) ||
|
2007-06-24 21:06:07 +00:00
|
|
|
die "Unable to checkout submodule '$path'"
|
|
|
|
git add "$path" ||
|
|
|
|
die "Failed to add submodule '$path'"
|
|
|
|
|
|
|
|
GIT_CONFIG=.gitmodules git config submodule."$path".path "$path" &&
|
|
|
|
GIT_CONFIG=.gitmodules git config submodule."$path".url "$repo" &&
|
|
|
|
git add .gitmodules ||
|
|
|
|
die "Failed to register submodule '$path'"
|
|
|
|
}
|
|
|
|
|
2007-05-26 13:56:40 +00:00
|
|
|
#
|
2007-06-06 09:13:02 +00:00
|
|
|
# Register submodules in .git/config
|
2007-05-26 13:56:40 +00:00
|
|
|
#
|
|
|
|
# $@ = requested paths (default to all)
|
|
|
|
#
|
2008-01-15 10:35:49 +00:00
|
|
|
cmd_init()
|
2007-05-26 13:56:40 +00:00
|
|
|
{
|
2008-01-15 10:48:45 +00:00
|
|
|
# parse $args after "submodule ... init".
|
|
|
|
while test $# -ne 0
|
|
|
|
do
|
|
|
|
case "$1" in
|
|
|
|
-q|--quiet)
|
|
|
|
quiet=1
|
|
|
|
;;
|
|
|
|
--)
|
|
|
|
shift
|
|
|
|
break
|
|
|
|
;;
|
|
|
|
-*)
|
|
|
|
usage
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
break
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
shift
|
|
|
|
done
|
|
|
|
|
2007-05-26 13:56:40 +00:00
|
|
|
git ls-files --stage -- "$@" | grep -e '^160000 ' |
|
|
|
|
while read mode sha1 stage path
|
|
|
|
do
|
2007-06-06 09:13:02 +00:00
|
|
|
# Skip already registered paths
|
2007-06-11 19:12:24 +00:00
|
|
|
name=$(module_name "$path") || exit
|
2007-07-03 05:52:14 +00:00
|
|
|
url=$(git config submodule."$name".url)
|
2007-06-06 09:13:02 +00:00
|
|
|
test -z "$url" || continue
|
2007-05-26 13:56:40 +00:00
|
|
|
|
2007-07-03 05:52:14 +00:00
|
|
|
url=$(GIT_CONFIG=.gitmodules git config submodule."$name".url)
|
2007-05-26 13:56:40 +00:00
|
|
|
test -z "$url" &&
|
2007-06-11 19:12:24 +00:00
|
|
|
die "No url found for submodule path '$path' in .gitmodules"
|
2007-05-26 13:56:40 +00:00
|
|
|
|
2007-09-24 02:19:42 +00:00
|
|
|
# Possibly a url relative to parent
|
|
|
|
case "$url" in
|
|
|
|
./*|../*)
|
|
|
|
url="$(resolve_relative_url "$url")"
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
2007-07-03 05:52:14 +00:00
|
|
|
git config submodule."$name".url "$url" ||
|
2007-06-11 19:12:24 +00:00
|
|
|
die "Failed to register url for submodule path '$path'"
|
2007-05-26 13:56:40 +00:00
|
|
|
|
2007-06-11 19:12:24 +00:00
|
|
|
say "Submodule '$name' ($url) registered for path '$path'"
|
2007-05-26 13:56:40 +00:00
|
|
|
done
|
|
|
|
}
|
|
|
|
|
|
|
|
#
|
2007-06-06 09:13:02 +00:00
|
|
|
# Update each submodule path to correct revision, using clone and checkout as needed
|
2007-05-26 13:56:40 +00:00
|
|
|
#
|
|
|
|
# $@ = requested paths (default to all)
|
|
|
|
#
|
2008-01-15 10:35:49 +00:00
|
|
|
cmd_update()
|
2007-05-26 13:56:40 +00:00
|
|
|
{
|
2008-01-15 10:48:45 +00:00
|
|
|
# parse $args after "submodule ... update".
|
|
|
|
while test $# -ne 0
|
|
|
|
do
|
|
|
|
case "$1" in
|
|
|
|
-q|--quiet)
|
|
|
|
quiet=1
|
|
|
|
;;
|
|
|
|
--)
|
|
|
|
shift
|
|
|
|
break
|
|
|
|
;;
|
|
|
|
-*)
|
|
|
|
usage
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
break
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
shift
|
|
|
|
done
|
|
|
|
|
2007-05-26 13:56:40 +00:00
|
|
|
git ls-files --stage -- "$@" | grep -e '^160000 ' |
|
|
|
|
while read mode sha1 stage path
|
|
|
|
do
|
2007-06-11 19:12:24 +00:00
|
|
|
name=$(module_name "$path") || exit
|
2007-07-03 05:52:14 +00:00
|
|
|
url=$(git config submodule."$name".url)
|
2007-06-06 09:13:02 +00:00
|
|
|
if test -z "$url"
|
2007-05-26 13:56:40 +00:00
|
|
|
then
|
|
|
|
# Only mention uninitialized submodules when its
|
|
|
|
# path have been specified
|
|
|
|
test "$#" != "0" &&
|
2007-06-11 19:12:24 +00:00
|
|
|
say "Submodule path '$path' not initialized"
|
2007-06-06 09:13:02 +00:00
|
|
|
continue
|
|
|
|
fi
|
|
|
|
|
|
|
|
if ! test -d "$path"/.git
|
|
|
|
then
|
|
|
|
module_clone "$path" "$url" || exit
|
2007-06-11 19:12:22 +00:00
|
|
|
subsha1=
|
|
|
|
else
|
2007-12-04 22:45:16 +00:00
|
|
|
subsha1=$(unset GIT_DIR; cd "$path" &&
|
2007-07-03 05:52:14 +00:00
|
|
|
git rev-parse --verify HEAD) ||
|
2007-06-11 19:12:24 +00:00
|
|
|
die "Unable to find current revision in submodule path '$path'"
|
2007-05-26 13:56:40 +00:00
|
|
|
fi
|
2007-06-06 09:13:02 +00:00
|
|
|
|
2007-05-26 13:56:40 +00:00
|
|
|
if test "$subsha1" != "$sha1"
|
|
|
|
then
|
2007-12-04 22:45:16 +00:00
|
|
|
(unset GIT_DIR; cd "$path" && git-fetch &&
|
2007-05-26 13:56:40 +00:00
|
|
|
git-checkout -q "$sha1") ||
|
2007-06-11 19:12:24 +00:00
|
|
|
die "Unable to checkout '$sha1' in submodule path '$path'"
|
2007-05-26 13:56:40 +00:00
|
|
|
|
2007-06-11 19:12:24 +00:00
|
|
|
say "Submodule path '$path': checked out '$sha1'"
|
2007-05-26 13:56:40 +00:00
|
|
|
fi
|
|
|
|
done
|
|
|
|
}
|
|
|
|
|
2007-06-26 23:40:58 +00:00
|
|
|
set_name_rev () {
|
|
|
|
revname=$( (
|
2007-12-04 22:45:16 +00:00
|
|
|
unset GIT_DIR
|
2007-06-26 23:40:58 +00:00
|
|
|
cd "$1" && {
|
2007-07-03 05:52:14 +00:00
|
|
|
git describe "$2" 2>/dev/null ||
|
|
|
|
git describe --tags "$2" 2>/dev/null ||
|
|
|
|
git describe --contains --tags "$2"
|
2007-06-26 23:40:58 +00:00
|
|
|
}
|
|
|
|
) )
|
|
|
|
test -z "$revname" || revname=" ($revname)"
|
|
|
|
}
|
|
|
|
|
2007-05-26 13:56:40 +00:00
|
|
|
#
|
2007-06-11 19:12:24 +00:00
|
|
|
# List all submodules, prefixed with:
|
2007-05-26 13:56:40 +00:00
|
|
|
# - 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)
|
|
|
|
#
|
2008-01-15 10:35:49 +00:00
|
|
|
cmd_status()
|
2007-05-26 13:56:40 +00:00
|
|
|
{
|
2008-01-15 10:48:45 +00:00
|
|
|
# parse $args after "submodule ... status".
|
|
|
|
while test $# -ne 0
|
|
|
|
do
|
|
|
|
case "$1" in
|
|
|
|
-q|--quiet)
|
|
|
|
quiet=1
|
|
|
|
;;
|
|
|
|
--cached)
|
|
|
|
cached=1
|
|
|
|
;;
|
|
|
|
--)
|
|
|
|
shift
|
|
|
|
break
|
|
|
|
;;
|
|
|
|
-*)
|
|
|
|
usage
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
break
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
shift
|
|
|
|
done
|
|
|
|
|
2007-05-26 13:56:40 +00:00
|
|
|
git ls-files --stage -- "$@" | grep -e '^160000 ' |
|
|
|
|
while read mode sha1 stage path
|
|
|
|
do
|
2007-06-11 19:12:24 +00:00
|
|
|
name=$(module_name "$path") || exit
|
2007-07-03 05:52:14 +00:00
|
|
|
url=$(git config submodule."$name".url)
|
2007-06-11 19:12:24 +00:00
|
|
|
if test -z "url" || ! test -d "$path"/.git
|
2007-05-26 13:56:40 +00:00
|
|
|
then
|
|
|
|
say "-$sha1 $path"
|
|
|
|
continue;
|
|
|
|
fi
|
2007-07-04 16:22:14 +00:00
|
|
|
set_name_rev "$path" "$sha1"
|
2007-05-26 13:56:40 +00:00
|
|
|
if git diff-files --quiet -- "$path"
|
|
|
|
then
|
2007-06-26 23:40:58 +00:00
|
|
|
say " $sha1 $path$revname"
|
2007-05-26 13:56:40 +00:00
|
|
|
else
|
|
|
|
if test -z "$cached"
|
|
|
|
then
|
2007-12-04 22:45:16 +00:00
|
|
|
sha1=$(unset GIT_DIR; cd "$path" && git rev-parse --verify HEAD)
|
2007-07-04 16:22:14 +00:00
|
|
|
set_name_rev "$path" "$sha1"
|
2007-05-26 13:56:40 +00:00
|
|
|
fi
|
2007-06-26 23:40:58 +00:00
|
|
|
say "+$sha1 $path$revname"
|
2007-05-26 13:56:40 +00:00
|
|
|
fi
|
|
|
|
done
|
|
|
|
}
|
|
|
|
|
2008-01-15 10:48:45 +00:00
|
|
|
# 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"
|
2007-05-26 13:56:40 +00:00
|
|
|
do
|
|
|
|
case "$1" in
|
2008-01-15 10:48:45 +00:00
|
|
|
add | init | update | status)
|
|
|
|
command=$1
|
2007-05-26 13:56:40 +00:00
|
|
|
;;
|
|
|
|
-q|--quiet)
|
|
|
|
quiet=1
|
|
|
|
;;
|
2007-06-24 21:06:07 +00:00
|
|
|
-b|--branch)
|
|
|
|
case "$2" in
|
|
|
|
'')
|
|
|
|
usage
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
branch="$2"; shift
|
|
|
|
;;
|
2007-05-26 13:56:40 +00:00
|
|
|
--cached)
|
|
|
|
cached=1
|
|
|
|
;;
|
|
|
|
--)
|
|
|
|
break
|
|
|
|
;;
|
|
|
|
-*)
|
|
|
|
usage
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
break
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
shift
|
|
|
|
done
|
|
|
|
|
2008-01-15 10:48:45 +00:00
|
|
|
# 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
|
2007-06-24 21:06:07 +00:00
|
|
|
usage
|
2008-01-15 10:48:45 +00:00
|
|
|
fi
|
|
|
|
|
|
|
|
# "--cached" is accepted only by "status"
|
|
|
|
if test -n "$cached" && test "$command" != status
|
|
|
|
then
|
2007-05-26 13:56:40 +00:00
|
|
|
usage
|
2008-01-15 10:48:45 +00:00
|
|
|
fi
|
|
|
|
|
|
|
|
"cmd_$command" "$@"
|