| commit | 7e25437d35a70791b345872af202eabfb3e1a8bc | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 18 Jul 2018 19:20:28 +0000 (18 12:20 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 18 Jul 2018 19:20:28 +0000 (18 12:20 -0700) | ||
| tree | 1d8dcdc9814e310d8be656b11d76885c37191185 | treesnapshot (tar.gz zip) |
| parent | 00624d608cc69bd62801c93e74d1ea7a7ddd6598 | commitdiff |
| parent | 984cd77ddbf0eea7371a18ad7124120473b6bb2d | commitdiff |
Merge branch 'sb/submodule-core-worktree'
"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
"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
| builtin/submodule--helper.c | diff1 | diff2 | blobhistory |
| git-submodule.sh | diff1 | diff2 | blobhistory |
| submodule.c | diff1 | diff2 | blobhistory |
| t/t7400-submodule-basic.sh | diff1 | diff2 | blobhistory |