diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-09-11 18:10:17 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-11 18:10:17 (GMT) |
| commit | ee7a83f6314a6fe281c8e3e041cfd42b5a2deb44 (patch) | |
| tree | 2dfda34bb7872b99c9af10b66201b596663b5370 /git-submodule.sh | |
| parent | ef92392b6c8596b61eab6f2045a54c086f340cf7 (diff) | |
| parent | 01d4721565f1562172149ebb91d29d6a7e7f922d (diff) | |
| download | git-ee7a83f6314a6fe281c8e3e041cfd42b5a2deb44.zip git-ee7a83f6314a6fe281c8e3e041cfd42b5a2deb44.tar.gz git-ee7a83f6314a6fe281c8e3e041cfd42b5a2deb44.tar.bz2 | |
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 'git-submodule.sh')
| -rwxr-xr-x | git-submodule.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-submodule.sh b/git-submodule.sh index dd3ae0e..e89b516 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -564,7 +564,7 @@ Maybe you want to use 'update --init'?")" die "$(eval_gettext "Unable to find current revision in submodule path '\$sm_path'")" fi - if test "$subsha1" != "$sha1" + if test "$subsha1" != "$sha1" -o -n "$force" then subforce=$force # If we don't already have a -f flag and the submodule has never been checked out |