Add --depth to submodule update/add
Add the --depth option to the add and update commands of "git submodule", which is then passed on to the clone command. This is useful when the submodule(s) are huge and you're not really interested in anything but the latest commit. Tests are added and some indention adjustments were made to conform to the rest of the testfile on "submodule update can handle symbolic links in pwd". Signed-off-by: Fredrik Gustafsson <iveqy@iveqy.com> Acked-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
edca415256
commit
275cd184d5
@ -32,6 +32,7 @@ nofetch=
|
||||
update=
|
||||
prefix=
|
||||
custom_name=
|
||||
depth=
|
||||
|
||||
# The function takes at most 2 arguments. The first argument is the
|
||||
# URL that navigates to the submodule origin repo. When relative, this URL
|
||||
@ -211,6 +212,7 @@ module_clone()
|
||||
name=$2
|
||||
url=$3
|
||||
reference="$4"
|
||||
depth="$5"
|
||||
quiet=
|
||||
if test -n "$GIT_QUIET"
|
||||
then
|
||||
@ -233,7 +235,7 @@ module_clone()
|
||||
mkdir -p "$gitdir_base"
|
||||
(
|
||||
clear_local_git_env
|
||||
git clone $quiet -n ${reference:+"$reference"} \
|
||||
git clone $quiet ${depth:+"$depth"} -n ${reference:+"$reference"} \
|
||||
--separate-git-dir "$gitdir" "$url" "$sm_path"
|
||||
) ||
|
||||
die "$(eval_gettext "Clone of '\$url' into submodule path '\$sm_path' failed")"
|
||||
@ -309,6 +311,14 @@ cmd_add()
|
||||
custom_name=$2
|
||||
shift
|
||||
;;
|
||||
--depth)
|
||||
case "$2" in '') usage ;; esac
|
||||
depth="--depth=$2"
|
||||
shift
|
||||
;;
|
||||
--depth=*)
|
||||
depth=$1
|
||||
;;
|
||||
--)
|
||||
shift
|
||||
break
|
||||
@ -405,7 +415,7 @@ Use -f if you really want to add it." >&2
|
||||
echo "$(eval_gettext "Reactivating local git directory for submodule '\$sm_name'.")"
|
||||
fi
|
||||
fi
|
||||
module_clone "$sm_path" "$sm_name" "$realrepo" "$reference" || exit
|
||||
module_clone "$sm_path" "$sm_name" "$realrepo" "$reference" "$depth" || exit
|
||||
(
|
||||
clear_local_git_env
|
||||
cd "$sm_path" &&
|
||||
@ -676,6 +686,14 @@ cmd_update()
|
||||
--checkout)
|
||||
update="checkout"
|
||||
;;
|
||||
--depth)
|
||||
case "$2" in '') usage ;; esac
|
||||
depth="--depth=$2"
|
||||
shift
|
||||
;;
|
||||
--depth=*)
|
||||
depth=$1
|
||||
;;
|
||||
--)
|
||||
shift
|
||||
break
|
||||
@ -735,7 +753,7 @@ Maybe you want to use 'update --init'?")"
|
||||
|
||||
if ! test -d "$sm_path"/.git -o -f "$sm_path"/.git
|
||||
then
|
||||
module_clone "$sm_path" "$name" "$url" "$reference" || exit
|
||||
module_clone "$sm_path" "$name" "$url" "$reference" "$depth" || exit
|
||||
cloned_modules="$cloned_modules;$name"
|
||||
subsha1=
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user