Merge branch 'maint-1.7.2' into maint

diff --git a/t/t4041-diff-submodule-option.sh b/t/t4041-diff-submodule-option.sh
index 737c3d93ff7bf332120e31ad610396588e4a42df..995bdfafecedf6b629acdb3300732a4bb691f23c 100755 (executable)
--- a/t/t4041-diff-submodule-option.sh
+++ b/t/t4041-diff-submodule-option.sh
@@ -85,9 +85,10 @@ EOF
 "
 
 commit_file sm1 &&
-head3=$(cd sm1 &&
-git reset --hard HEAD~2 >/dev/null &&
-git rev-parse --verify HEAD | cut -c1-7
+head3=$(
+       cd sm1 &&
+       git reset --hard HEAD~2 >/dev/null &&
+       git rev-parse --verify HEAD | cut -c1-7
 )
 
 test_expect_success 'modified submodule(backward)' "