Merge branch 'fg/submodule-non-ascii-path'

diff --git a/git-submodule.sh b/git-submodule.sh
index 48bdf843244503df247e0dbdef3c5541cd9eb48e..eb58c8e89d28626fed56604533ffb4b87991a6af 100755 (executable)
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -1130,16 +1130,16 @@ cmd_status()
                        say "-$sha1 $displaypath"
                        continue;
                fi
-               set_name_rev "$sm_path" "$sha1"
                if git diff-files --ignore-submodules=dirty --quiet -- "$sm_path"
                then
+                       set_name_rev "$sm_path" "$sha1"
                        say " $sha1 $displaypath$revname"
                else
                        if test -z "$cached"
                        then
                                sha1=$(clear_local_git_env; cd "$sm_path" && git rev-parse --verify HEAD)
-                               set_name_rev "$sm_path" "$sha1"
                        fi
+                       set_name_rev "$sm_path" "$sha1"
                        say "+$sha1 $displaypath$revname"
                fi