diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-09-11 20:10:17 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-11 20:10:17 +0200 |
| commit | ee7a83f6314a6fe281c8e3e041cfd42b5a2deb44 (patch) | |
| tree | 2dfda34bb7872b99c9af10b66201b596663b5370 /t | |
| parent | Merge branch 'ph/stash-rerere' into maint-1.7.11 (diff) | |
| parent | Make 'git submodule update --force' always check out submodules. (diff) | |
| download | git-ee7a83f6314a6fe281c8e3e041cfd42b5a2deb44.tar.xz git-ee7a83f6314a6fe281c8e3e041cfd42b5a2deb44.zip | |
Merge branch 'sz/submodule-force-update' into maint-1.7.11
* sz/submodule-force-update:
Make 'git submodule update --force' always check out submodules.
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7406-submodule-update.sh | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh index 646298b212..15426530e4 100755 --- 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 |