magit-insert-diff: enforce short diff style for submodules

Fix #553.
Merge branch 'hotfix/submodule-diff' into maint
Merge branch 'maint'
Merge branch 'master' into next