[PATCH] submodule: no [--merge|--rebase] when newly cloned
- From
Spencer E. Olson <olsonse@umich.edu>
- Date
- Feb 16, 2011, 12:46 UTC
- Message-ID
- <1297860417-21895-1-git-send-email-olsonse@umich.edu>
Previously, when a submodule was cloned in the same command execution, --rebase or --merge would attempt to run (instead of and) before a checkout, resulting in an empty working directory. This patch ignores --rebase or --merge for a particular submodule when that submodule is newly cloned and instead simply checks out the appropriate revision.
Signed-off-by: Spencer E. Olson <olsonse@umich.edu> --- git-submodule.sh | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/git-submodule.sh b/git-submodule.sh index 8b90589..44d8741 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -365,6 +365,27 @@ cmd_init() } # +# Test whether an element of the $3(=IFS) separated list $2 matches $1 +# +str_contains() +{ + if test -n "$3" + then + local IFS="$3" + fi + for i in $2 + do + if test "$i" = "$1" + then + echo "yes" + return + fi + done + echo "no" + return +} + +# # Update each submodule path to correct revision, using clone and checkout as needed # # $@ = requested paths (default to all) @@ -423,6 +444,7 @@ cmd_update() cmd_init "--" "$@" || return fi + cloned_modules= module_list "$@" | while read mode sha1 stage path do @@ -442,6 +464,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 +492,11 @@ cmd_update() die "Unable to fetch in submodule path '$path'" fi + if test "$(str_contains "$name" "$cloned_modules" '\;')" = "yes" + then + update_module= + fi + case "$update_module" in rebase) command="git rebase"
-- 1.7.4.1.42.g43f9f