If "git merge" brings in a submodule update then allow it without requiring the extra step added in commit 48e72dd1 (Check submodules staged with other changes, 2010-08-10).