git-merge: add --ff and --no-ff options

[git.git] / git-submodule.sh

diff --git a/git-submodule.sh b/git-submodule.sh
index afbaec7a742b7bc93d7ca889f472401619f33ec7..673aa27a452b11af62d89986bf21c8a4f10e0c41 100755 (executable)
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -236,7 +236,6 @@ modules_list()
                        say "-$sha1 $path"
                        continue;
                fi
-               revname=$(unset GIT_DIR && cd "$path" && git describe --tags $sha1)
                set_name_rev "$path" "$sha1"
                if git diff-files --quiet -- "$path"
                then
@@ -252,7 +251,7 @@ modules_list()
        done
 }
 
-while case "$#" in 0) break ;; esac
+while test $# != 0
 do
        case "$1" in
        add)
@@ -314,7 +313,7 @@ case "$add,$init,$update,$status,$cached" in
 ,,1,,)
        modules_update "$@"
        ;;
-,,,1,*)
+,,,*,*)
        modules_list "$@"
        ;;
 *)