submodule update: when using recursion, show full path

Previously when using update with recursion, only the path for the
inner-most module was printed. Now the path is printed relative to
the directory the command was started from. This now matches the
behavior of submodule foreach.

Signed-off-by: William Entriken <github.com@phor.net>
Acked-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/git-submodule.sh b/git-submodule.sh
index 2365149d0b920ece4d076dafbebf23fef6888df1..f2c53c9a02d84ae4ecd0f465388d26febfcae519 100755 (executable)
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -588,7 +588,7 @@ cmd_update()
                die_if_unmatched "$mode"
                if test "$stage" = U
                then
                die_if_unmatched "$mode"
                if test "$stage" = U
                then

-                       echo >&2 "Skipping unmerged submodule $sm_path"
+                       echo >&2 "Skipping unmerged submodule $prefix$sm_path"

                        continue
                fi
                name=$(module_name "$sm_path") || exit
                        continue
                fi
                name=$(module_name "$sm_path") || exit


@@ -602,7 +602,7 @@ cmd_update()
 
                if test "$update_module" = "none"
                then
 
                if test "$update_module" = "none"
                then

-                       echo "Skipping submodule '$sm_path'"
+                       echo "Skipping submodule '$prefix$sm_path'"

                        continue
                fi
 
                        continue
                fi
 


@@ -611,7 +611,7 @@ cmd_update()
                        # Only mention uninitialized submodules when its
                        # path have been specified
                        test "$#" != "0" &&
                        # Only mention uninitialized submodules when its
                        # path have been specified
                        test "$#" != "0" &&

-                       say "$(eval_gettext "Submodule path '\$sm_path' not initialized
+                       say "$(eval_gettext "Submodule path '\$prefix\$sm_path' not initialized

 Maybe you want to use 'update --init'?")"
                        continue
                fi
 Maybe you want to use 'update --init'?")"
                        continue
                fi


@@ -624,7 +624,7 @@ Maybe you want to use 'update --init'?")"
                else
                        subsha1=$(clear_local_git_env; cd "$sm_path" &&
                                git rev-parse --verify HEAD) ||
                else
                        subsha1=$(clear_local_git_env; cd "$sm_path" &&
                                git rev-parse --verify HEAD) ||

-                       die "$(eval_gettext "Unable to find current revision in submodule path '\$sm_path'")"
+                       die "$(eval_gettext "Unable to find current revision in submodule path '\$prefix\$sm_path'")"

                fi
 
                if test "$subsha1" != "$sha1" -o -n "$force"
                fi
 
                if test "$subsha1" != "$sha1" -o -n "$force"


@@ -643,7 +643,7 @@ Maybe you want to use 'update --init'?")"
                                (clear_local_git_env; cd "$sm_path" &&
                                        ( (rev=$(git rev-list -n 1 $sha1 --not --all 2>/dev/null) &&
                                         test -z "$rev") || git-fetch)) ||
                                (clear_local_git_env; cd "$sm_path" &&
                                        ( (rev=$(git rev-list -n 1 $sha1 --not --all 2>/dev/null) &&
                                         test -z "$rev") || git-fetch)) ||

-                               die "$(eval_gettext "Unable to fetch in submodule path '\$sm_path'")"
+                               die "$(eval_gettext "Unable to fetch in submodule path '\$prefix\$sm_path'")"

                        fi
 
                        # Is this something we just cloned?
                        fi
 
                        # Is this something we just cloned?


@@ -657,20 +657,20 @@ Maybe you want to use 'update --init'?")"
                        case "$update_module" in
                        rebase)
                                command="git rebase"
                        case "$update_module" in
                        rebase)
                                command="git rebase"

-                               die_msg="$(eval_gettext "Unable to rebase '\$sha1' in submodule path '\$sm_path'")"
-                               say_msg="$(eval_gettext "Submodule path '\$sm_path': rebased into '\$sha1'")"
+                               die_msg="$(eval_gettext "Unable to rebase '\$sha1' in submodule path '\$prefix\$sm_path'")"
+                               say_msg="$(eval_gettext "Submodule path '\$prefix\$sm_path': rebased into '\$sha1'")"

                                must_die_on_failure=yes
                                ;;
                        merge)
                                command="git merge"
                                must_die_on_failure=yes
                                ;;
                        merge)
                                command="git merge"

-                               die_msg="$(eval_gettext "Unable to merge '\$sha1' in submodule path '\$sm_path'")"
-                               say_msg="$(eval_gettext "Submodule path '\$sm_path': merged in '\$sha1'")"
+                               die_msg="$(eval_gettext "Unable to merge '\$sha1' in submodule path '\$prefix\$sm_path'")"
+                               say_msg="$(eval_gettext "Submodule path '\$prefix\$sm_path': merged in '\$sha1'")"

                                must_die_on_failure=yes
                                ;;
                        *)
                                command="git checkout $subforce -q"
                                must_die_on_failure=yes
                                ;;
                        *)
                                command="git checkout $subforce -q"

-                               die_msg="$(eval_gettext "Unable to checkout '\$sha1' in submodule path '\$sm_path'")"
-                               say_msg="$(eval_gettext "Submodule path '\$sm_path': checked out '\$sha1'")"
+                               die_msg="$(eval_gettext "Unable to checkout '\$sha1' in submodule path '\$prefix\$sm_path'")"
+                               say_msg="$(eval_gettext "Submodule path '\$prefix\$sm_path': checked out '\$sha1'")"

                                ;;
                        esac
 
                                ;;
                        esac
 


@@ -688,11 +688,16 @@ Maybe you want to use 'update --init'?")"
 
                if test -n "$recursive"
                then
 
                if test -n "$recursive"
                then

-                       (clear_local_git_env; cd "$sm_path" && eval cmd_update "$orig_flags")
+                       (
+                               prefix="$prefix$sm_path/"
+                               clear_local_git_env
+                               cd "$sm_path" &&
+                               eval cmd_update "$orig_flags"
+                       )

                        res=$?
                        if test $res -gt 0
                        then
                        res=$?
                        if test $res -gt 0
                        then

-                               die_msg="$(eval_gettext "Failed to recurse into submodule path '\$sm_path'")"
+                               die_msg="$(eval_gettext "Failed to recurse into submodule path '\$prefix\$sm_path'")"

                                if test $res -eq 1
                                then
                                        err="${err};$die_msg"
                                if test $res -eq 1
                                then
                                        err="${err};$die_msg"

diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh
index feaec6cdf4b8c7eac348ea1de61887c93c69244d..70528b7e1520bdcd9480a20ac5a993ba96c80ce8 100755 (executable)
--- a/t/t7406-submodule-update.sh
+++ b/t/t7406-submodule-update.sh
@@ -612,7 +612,8 @@ test_expect_success 'submodule update places git-dir in superprojects git-dir re
        rm -rf super_update_r2 &&
        git clone super_update_r super_update_r2 &&
        (cd super_update_r2 &&
        rm -rf super_update_r2 &&
        git clone super_update_r super_update_r2 &&
        (cd super_update_r2 &&

-        git submodule update --init --recursive &&
+        git submodule update --init --recursive >actual &&
+        test_i18ngrep "Submodule path .submodule/subsubmodule.: checked out" actual &&

         (cd submodule/subsubmodule &&
          git log > ../../expected
         ) &&
         (cd submodule/subsubmodule &&
          git log > ../../expected
         ) &&