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. Verification of the behaviour of '$name' is also added to the git submodule foreach selftest. Signed-off-by: Johan Herland <johan@xxxxxxxxxxx> --- This patch was initially sent stand-alone on 2009-08-16. ...Johan Documentation/git-submodule.txt | 3 ++- git-submodule.sh | 1 + t/t7407-submodule-foreach.sh | 6 +++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt index bb7d159..cfa8d73 100644 --- a/Documentation/git-submodule.txt +++ b/Documentation/git-submodule.txt @@ -135,7 +135,8 @@ summary:: 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 diff --git a/git-submodule.sh b/git-submodule.sh index c58eca4..6163d01 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -266,6 +266,7 @@ cmd_foreach() 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 diff --git a/t/t7407-submodule-foreach.sh b/t/t7407-submodule-foreach.sh index 76e0734..991aa80 100755 --- a/t/t7407-submodule-foreach.sh +++ b/t/t7407-submodule-foreach.sh @@ -61,9 +61,9 @@ sub3sha1=$(cd super/sub3 && git rev-parse HEAD) cat > expect <<EOF Entering 'sub1' -sub1-$sub1sha1 +foo1-sub1-$sub1sha1 Entering 'sub3' -sub3-$sub3sha1 +foo3-sub3-$sub3sha1 EOF test_expect_success 'test basic "submodule foreach" usage' ' @@ -71,7 +71,7 @@ test_expect_success 'test basic "submodule foreach" usage' ' ( cd clone && git submodule update --init -- sub1 sub3 && - git submodule foreach "echo \$path-\$sha1" > ../actual + git submodule foreach "echo \$name-\$path-\$sha1" > ../actual ) && test_cmp expect actual ' -- 1.6.4.304.g1365c.dirty -- 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