When -u|--use-gitmodules is given the update command uses the .gitmodules config file instead of the .git/config file to obtain the track parameter. This makes it for example possible to change branches for all submodules at the same time without having to sync up .git/config first. Signed-off-by: Fabian Franz <git@xxxxxxxxxxxxxxx> --- Documentation/git-submodule.txt | 8 +++++++- git-submodule.sh | 9 ++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt index 14c1d5c..175b4b5 100644 --- a/Documentation/git-submodule.txt +++ b/Documentation/git-submodule.txt @@ -12,7 +12,7 @@ SYNOPSIS 'git submodule' [--quiet] add [-b branch] [-t|--track <branch>] [--] <repository> <path> 'git submodule' [--quiet] status [--cached] [--] [<path>...] 'git submodule' [--quiet] init [--] [<path>...] -'git submodule' [--quiet] update [--init] [-N|--no-fetch] [--] [<path>...] +'git submodule' [--quiet] update [--init] [-N|--no-fetch] [-u|--use-gitmodules] [--] [<path>...] 'git submodule' [--quiet] summary [--summary-limit <n>] [commit] [--] [<path>...] 'git submodule' [--quiet] foreach <command> 'git submodule' [--quiet] sync [--] [<path>...] @@ -185,6 +185,12 @@ OPTIONS This option is only valid for the update command. Don't fetch new objects from the remote site. +-u:: +--use-gitmodules:: + This option is only valid for the update command. + Use the tracking information found in .gitmodules + (track) and ignore .git/config. + <path>...:: Paths to submodule(s). When specified this will restrict the command to only operate on the submodules found at the specified paths. diff --git a/git-submodule.sh b/git-submodule.sh index f66622b..81b96dd 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -5,7 +5,7 @@ # Copyright (c) 2007 Lars Hjemli USAGE="[--quiet] [--cached] \ -[add <repo> [-b branch] [--track|-t <branch>] <path>]|[status|init|update [-i|--init] [-N|--no-fetch]|summary [-n|--summary-limit <n>] [<commit>]] \ +[add <repo> [-b branch] [--track|-t <branch>] <path>]|[status|init|update [-i|--init] [-N|--no-fetch] [-u|--use-gitmodules]|summary [-n|--summary-limit <n>] [<commit>]] \ [--] [<path>...]|[foreach <command>]|[sync [--] [<path>...]]" OPTIONS_SPEC= . git-sh-setup @@ -18,6 +18,7 @@ quiet= cached= track= nofetch= +usegitmodules= # # print stuff on stdout unless -q was specified @@ -318,6 +319,10 @@ cmd_update() shift nofetch=1 ;; + -u|--use-gitmodules) + shift + usegitmodules=1 + ;; --) shift break @@ -347,6 +352,8 @@ cmd_update() fi track=$(git config submodule."$name".track) + test -n "$usegitmodules" && + track=$(git config -f .gitmodules submodule."$name".track) if test -n "$track" then git-update-index --assume-unchanged "$path" -- 1.5.3.6 -- 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
