From d4266a83ec0fa52b8d0f6e4706c25b4a5b955b72 Mon Sep 17 00:00:00 2001 From: Jocelyn Fiat Date: Mon, 31 Oct 2011 02:43:44 -0700 Subject: [PATCH] updated instructions related to submodules --- README.md | 3 +-- tools/update_git_working_copy.bat | 3 ++- tools/update_git_working_copy.sh | 7 +++---- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index d9ab2966..3de9fe32 100644 --- a/README.md +++ b/README.md @@ -10,8 +10,7 @@ How to get the source code? * git clone https://github.com/Eiffel-World/Eiffel-Web-Framework.git * cd Eiffel-Web-Framework * git submodule update --init -* git submodule foreach git pull origin master -* git submodule foreach git checkout master +* git submodule foreach --recursive git checkout master * And to build the required and related Clibs ** cd ext/ise_library/curl diff --git a/tools/update_git_working_copy.bat b/tools/update_git_working_copy.bat index 595d0cbe..23029f38 100644 --- a/tools/update_git_working_copy.bat +++ b/tools/update_git_working_copy.bat @@ -1,9 +1,10 @@ cd %~dp0.. + echo Pull changes from origin master call git pull origin master echo Update all submodule recursively -call git submodule update --recursive +call git submodule update --init --recursive echo Checkout master branch for each submodule recursively call git submodule foreach --recursive git checkout master diff --git a/tools/update_git_working_copy.sh b/tools/update_git_working_copy.sh index 8512932f..f4f45482 100644 --- a/tools/update_git_working_copy.sh +++ b/tools/update_git_working_copy.sh @@ -1,11 +1,10 @@ #!/bin/sh -cd .. echo Pull changes from origin master -call git pull origin master +git pull origin master echo Update all submodule recursively -call git submodule update --recursive +git submodule update --init --recursive echo Checkout master branch for each submodule recursively -call git submodule foreach --recursive git checkout master +git submodule foreach --recursive git checkout master