merge, pull: introduce '--(no-)stat' option

diff --git a/git-submodule.sh b/git-submodule.sh
index 5f1d5ef06e2a60e7777d5d5532d3f738ab610440..7674346c8d9525b0d8928f48354bdbe0af8b8e23 100755 (executable)
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -232,7 +232,7 @@ cmd_init()
                shift
        done
 
-       git ls-files --stage -- "$@" | grep -e '^160000 ' |
+       git ls-files --stage -- "$@" | grep '^160000 ' |
        while read mode sha1 stage path
        do
                # Skip already registered paths
@@ -286,7 +286,7 @@ cmd_update()
                shift
        done
 
-       git ls-files --stage -- "$@" | grep -e '^160000 ' |
+       git ls-files --stage -- "$@" | grep '^160000 ' |
        while read mode sha1 stage path
        do
                name=$(module_name "$path") || exit
@@ -327,7 +327,7 @@ set_name_rev () {
                cd "$1" && {
                        git describe "$2" 2>/dev/null ||
                        git describe --tags "$2" 2>/dev/null ||
-                       git describe --contains --tags "$2"
+                       git describe --contains --tags --always "$2"
                }
        ) )
        test -z "$revname" || revname=" ($revname)"
@@ -537,7 +537,7 @@ cmd_status()
                shift
        done
 
-       git ls-files --stage -- "$@" | grep -e '^160000 ' |
+       git ls-files --stage -- "$@" | grep '^160000 ' |
        while read mode sha1 stage path
        do
                name=$(module_name "$path") || exit