]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'sb/submodule-core-worktree'
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 Jul 2018 19:20:28 +0000 (12:20 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Jul 2018 19:20:28 +0000 (12:20 -0700)
"git submodule" did not correctly adjust core.worktree setting that
indicates whether/where a submodule repository has its associated
working tree across various state transitions, which has been
corrected.

* sb/submodule-core-worktree:
  submodule deinit: unset core.worktree
  submodule: ensure core.worktree is set after update
  submodule: unset core.worktree if no working tree is present

1  2 
builtin/submodule--helper.c
git-submodule.sh
submodule.c
t/t7400-submodule-basic.sh

Simple merge
Simple merge
diff --cc submodule.c
Simple merge
Simple merge