diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-09-10 10:38:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-09-10 10:38:58 -0700 |
| commit | f38a45b9abec78ac04022c9ba043e78eb2d036e2 (patch) | |
| tree | 6d286bed7edb3a118d7f4d193e54406a68c213b0 /git-submodule.sh | |
| parent | fe468efff533c3c92c174ae4706532c1521c150c (diff) | |
| parent | f178c13fdac42763a7aa58bf260aa67d9f4393ec (diff) | |
| download | git-f38a45b9abec78ac04022c9ba043e78eb2d036e2.tar.xz | |
Merge branch 'jn/submodule-core-worktree-revert'
* jn/submodule-core-worktree-revert:
Revert "Merge branch 'sb/submodule-core-worktree'"
Diffstat (limited to 'git-submodule.sh')
| -rwxr-xr-x | git-submodule.sh | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/git-submodule.sh b/git-submodule.sh index f7fd80345c..1cb2c0a31b 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -580,11 +580,6 @@ cmd_update() die "$(eval_gettext "Unable to find current \${remote_name}/\${branch} revision in submodule path '\$sm_path'")" fi - if ! $(git config -f "$(git rev-parse --git-common-dir)/modules/$name/config" core.worktree) 2>/dev/null - then - git submodule--helper connect-gitdir-workingtree "$name" "$sm_path" - fi - if test "$subsha1" != "$sha1" || test -n "$force" then subforce=$force |