"Spencer E. Olson" <olsonse@xxxxxxxxx> writes:
> @@ -469,6 +484,12 @@ cmd_update()
> die "Unable to fetch in submodule path '$path'"
> fi
>
> + list_contains "$name" "$cloned_modules"
> + if test "$?" = 0
> + then
> + update_module=
> + fi
> +
It would be a lot easier to read if you said this:
if list_contains "$name" "$cloned_modules"
then
update_module=
fi
or just open code the idiom:
case ";list-of-stuff-with-delimiter;" in
*";i-want-to-see-this;"*) : happy ;;
esac
without introducing "list_contains" that is called only once.
But otherwise the patch looks good.
Thanks.
-- >8 --
From: Spencer E. Olson <olsonse@xxxxxxxxx>
Date: Thu, 17 Feb 2011 09:18:45 -0700
Subject: [PATCH] submodule: no [--merge|--rebase] when newly cloned
Previously, when a new submodule is cloned by running "git submodule update
[--merge|--rebase]", the newly cloned submodule does not get checked out and a
rebase or merge is incorrectly attempted against an empty working directory.
This patch ignores --rebase or --merge for new submodules and instead simply
checks out the appropriate revision.
Signed-off-by: Spencer E. Olson <olsonse@xxxxxxxxx>
Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx>
---
git-submodule.sh | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/git-submodule.sh b/git-submodule.sh
index 8b90589..5e989b7 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -423,6 +423,7 @@ cmd_update()
cmd_init "--" "$@" || return
fi
+ cloned_modules=
module_list "$@" |
while read mode sha1 stage path
do
@@ -442,6 +443,7 @@ cmd_update()
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" &&
@@ -469,6 +471,13 @@ cmd_update()
die "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
+
case "$update_module" in
rebase)
command="git rebase"
--
1.7.4.1.107.ga7184
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html