git submodule foreach: Provide access to submodule name, as '$name'

The argument to 'git submodule foreach' already has access to the variables
'$path' (the path to the submodule, relative to the superproject) and '$sha1'
(the submodule commit recorded by the superproject).

This patch adds another variable -- '$name' -- which contains the name of the
submodule, as recorded in the superproject's .gitmodules file.

Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt
index 7dd73ae14eb38fd5bd291c2251f64768d198ebe5..97c32fe264aa5f4f8abbf5361fa509a2ccbff48a 100644 (file)
--- a/Documentation/git-submodule.txt
+++ b/Documentation/git-submodule.txt
@@ -131,7 +131,8 @@ summary::
 
 foreach::
        Evaluates an arbitrary shell command in each checked out submodule.
 
 foreach::
        Evaluates an arbitrary shell command in each checked out submodule.

-       The command has access to the variables $path and $sha1:
+       The command has access to the variables $name, $path and $sha1:
+       $name is the name of the relevant submodule section in .gitmodules,

        $path is the name of the submodule directory relative to the
        superproject, and $sha1 is the commit as recorded in the superproject.
        Any submodules defined in the superproject but not checked out are
        $path is the name of the submodule directory relative to the
        superproject, and $sha1 is the commit as recorded in the superproject.
        Any submodules defined in the superproject but not checked out are

diff --git a/git-submodule.sh b/git-submodule.sh
index ebed711da41a7ac3c4caa7ae9b7f73e0c75f4fe7..d8ecdb91fe1f30f96c3aba1b5b8c36a965d8d89b 100755 (executable)
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -243,6 +243,7 @@ cmd_foreach()
                if test -e "$path"/.git
                then
                        say "Entering '$path'"
                if test -e "$path"/.git
                then
                        say "Entering '$path'"

+                       name=$(module_name "$path")

                        (cd "$path" && eval "$@") ||
                        die "Stopping at '$path'; script returned non-zero status."
                fi
                        (cd "$path" && eval "$@") ||
                        die "Stopping at '$path'; script returned non-zero status."
                fi