Merge branch 'pw/p4-submit-conflicts'

diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh
index 646298b2125fbbb7379ffb041099dc0d4bafaa55..15426530e49ef2e42cda2528f4a72a784eb40cd9 100755 (executable)
--- a/t/t7406-submodule-update.sh
+++ b/t/t7406-submodule-update.sh
@@ -123,6 +123,18 @@ test_expect_success 'submodule update should throw away changes with --force ' '
        )
 '
 
+test_expect_success 'submodule update --force forcibly checks out submodules' '
+       (cd super &&
+        (cd submodule &&
+         rm -f file
+        ) &&
+        git submodule update --force submodule &&
+        (cd submodule &&
+         test "$(git status -s file)" = ""
+        )
+       )
+'
+
 test_expect_success 'submodule update --rebase staying on master' '
        (cd super/submodule &&
          git checkout master