log.decorate: only ignore it under "log --pretty=raw"

diff --git a/git-submodule.sh b/git-submodule.sh
index 77d223292c5b167a8a33b04b10b46426b68e0576..c8d80822c23ad0daea258314966321a2873bd5f0 100755 (executable)
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -643,7 +643,7 @@ cmd_summary() {
                                range=$sha1_dst
                        fi
                        GIT_DIR="$name/.git" \
-                       git log --pretty=oneline --first-parent $range | wc -l
+                       git rev-list --first-parent $range -- | wc -l
                        )
                        total_commits=" ($(($total_commits + 0)))"
                        ;;
@@ -688,7 +688,11 @@ cmd_summary() {
                echo
        done |
        if test -n "$for_status"; then
-               echo "# Modified submodules:"
+               if [ -n "$files" ]; then
+                       echo "# Submodules changed but not updated:"
+               else
+                       echo "# Submodule changes to be committed:"
+               fi
                echo "#"
                sed -e 's|^|# |' -e 's|^# $|#|'
        else