merge-trees: let caller decide whether to renormalize

diff --git a/git-submodule.sh b/git-submodule.sh
index 3319b836b217a26b4ac55ae5ced328ffafa0a015..8c562a72e6e95fce60b78c015623212b7fce1dab 100755 (executable)
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -271,6 +271,8 @@ cmd_foreach()
                shift
        done
 
+       toplevel=$(pwd)
+
        module_list |
        while read mode sha1 stage path
        do
@@ -650,7 +652,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)))"
                        ;;