Jonathan Nieder f178c13fda Revert "Merge branch 'sb/submodule-core-worktree'" ... This reverts commit 7e25437d35, reversing changes made to 00624d608c. v2.19.0-rc0~165^2~1 (submodule: ensure core.worktree is set after update, 2018-06-18) assumes an "absorbed" submodule layout, where the submodule's Git directory is in the superproject's .git/modules/ directory and .git in the submodule worktree is a .git file pointing there. In particular, it uses $GIT_DIR/modules/$name to find the submodule to find out whether it already has core.worktree set, and it uses connect_work_tree_and_git_dir if not, resulting in fatal: could not open sub/.git for writing The context behind that patch: v2.19.0-rc0~165^2~2 (submodule: unset core.worktree if no working tree is present, 2018-06-12) unsets core.worktree when running commands like "git checkout --recurse-submodules" to switch to a branch without the submodule. If a user then uses "git checkout --no-recurse-submodules" to switch back to a branch with the submodule and runs "git submodule update", this patch is needed to ensure that commands using the submodule directly are aware of the path to the worktree. It is late in the release cycle, so revert the whole 3-patch series. We can try again later for 2.20. Reported-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Helped-by: Stefan Beller <sbeller@google.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2018-09-07 19:05:20 -07:00
..
add.c	Merge branch 'nd/no-the-index'	2018-08-20 11:33:53 -07:00
am.c	Merge branch 'en/directory-renames-nothanks'	2018-09-04 14:31:38 -07:00
annotate.c	…
apply.c	apply.c: make init_apply_state() take a struct repository	2018-08-13 14:14:44 -07:00
archive.c	archive.c: avoid access to the_index	2018-08-13 14:14:43 -07:00
bisect--helper.c	…
blame.c	Merge branch 'nd/no-the-index'	2018-08-20 11:33:53 -07:00
branch.c	branch: support configuring --sort via .gitconfig	2018-08-16 11:17:10 -07:00
bundle.c	…
cat-file.c	Merge branch 'nd/no-the-index'	2018-08-20 11:33:53 -07:00
check-attr.c	attr: remove index from git_attr_set_direction()	2018-08-13 14:14:43 -07:00
check-ignore.c	…
check-mailmap.c	…
check-ref-format.c	…
checkout-index.c	Merge branch 'rs/opt-updates'	2018-08-27 14:33:43 -07:00
checkout.c	Merge branch 'nd/no-the-index'	2018-08-20 11:33:53 -07:00
clean.c	dir.c: remove an implicit dependency on the_index in pathspec code	2018-08-13 14:14:42 -07:00
clone.c	Merge branch 'jt/connectivity-check-after-unshallow'	2018-08-15 15:08:28 -07:00
column.c	…
commit-graph.c	commit-graph: add free_commit_graph	2018-07-17 15:47:48 -07:00
commit-tree.c	commit: add repository argument to lookup_commit	2018-06-29 10:43:39 -07:00
commit.c	Merge branch 'nd/no-the-index'	2018-08-20 11:33:53 -07:00
config.c	Merge branch 'nd/i18n'	2018-08-15 15:08:23 -07:00
count-objects.c	…
credential.c	…
describe.c	Merge branch 'sb/object-store-grafts'	2018-07-18 12:20:28 -07:00
diff-files.c	…
diff-index.c	…
diff-tree.c	diff.c: move read_index() code back to the caller	2018-08-13 14:14:42 -07:00
diff.c	tag: add repository argument to deref_tag	2018-06-29 10:43:39 -07:00
difftool.c	Merge branch 'rs/parse-opt-lithelp'	2018-08-17 13:09:56 -07:00
fast-export.c	Merge branch 'nd/i18n'	2018-08-15 15:08:23 -07:00
fetch-pack.c	…
fetch.c	Merge branch 'jt/connectivity-check-after-unshallow'	2018-08-15 15:08:28 -07:00
fmt-merge-msg.c	Merge branch 'nd/i18n'	2018-08-15 15:08:23 -07:00
for-each-ref.c	…
fsck.c	Merge branch 'jk/core-use-replace-refs'	2018-08-15 15:08:23 -07:00
gc.c	Merge branch 'kg/gc-auto-windows-workaround'	2018-08-02 15:30:43 -07:00
get-tar-commit-id.c	…
grep.c	Merge branch 'nd/no-the-index'	2018-08-20 11:33:53 -07:00
hash-object.c	Merge branch 'sb/object-store-grafts'	2018-07-18 12:20:28 -07:00
help.c	Merge branch 'nd/command-list'	2018-06-01 15:06:37 +09:00
index-pack.c	Merge branch 'jk/core-use-replace-refs'	2018-08-15 15:08:23 -07:00
init-db.c	pass st.st_size as hint for strbuf_readlink()	2018-07-24 10:19:29 -07:00
interpret-trailers.c	…
log.c	Merge branch 'nd/i18n'	2018-08-15 15:08:23 -07:00
ls-files.c	ls-files: correct index argument to get_convert_attr_ascii()	2018-08-13 14:14:43 -07:00
ls-remote.c	Merge branch 'bw/server-options'	2018-05-23 14:38:15 +09:00
ls-tree.c	…
mailinfo.c	…
mailsplit.c	…
merge-base.c	commit: add repository argument to lookup_commit	2018-06-29 10:43:39 -07:00
merge-file.c	…
merge-index.c	…
merge-ours.c	…
merge-recursive.c	builtin/merge-recursive: make hash independent	2018-07-16 14:27:39 -07:00
merge-tree.c	Merge branch 'sb/object-store-grafts'	2018-07-18 12:20:28 -07:00
merge.c	Merge branch 'nd/i18n'	2018-08-15 15:08:23 -07:00
mktag.c	…
mktree.c	…
mv.c	Merge branch 'ma/lockfile-cleanup'	2018-05-30 14:04:05 +09:00
name-rev.c	tag: add repository argument to deref_tag	2018-06-29 10:43:39 -07:00
notes.c	Merge branch 'sb/object-store-grafts'	2018-07-18 12:20:28 -07:00
pack-objects.c	Merge branch 'nd/pack-deltify-regression-fix'	2018-08-22 11:17:05 -07:00
pack-redundant.c	…
pack-refs.c	…
patch-id.c	…
prune-packed.c	for_each_*_object: move declarations to object-store.h	2018-08-14 12:29:57 -07:00
prune.c	Merge branch 'jk/core-use-replace-refs'	2018-08-15 15:08:23 -07:00
pull.c	Merge branch 'rs/opt-updates'	2018-08-27 14:33:43 -07:00
push.c	Merge branch 'rs/opt-updates'	2018-08-27 14:33:43 -07:00
range-diff.c	range-diff: update stale summary of --no-dual-color	2018-08-27 13:13:59 -07:00
read-tree.c	Merge branch 'rs/parse-opt-lithelp'	2018-08-17 13:09:56 -07:00
rebase--helper.c	…
receive-pack.c	Merge branch 'sb/object-store-lookup'	2018-08-02 15:30:42 -07:00
reflog.c	Merge branch 'sb/object-store-grafts'	2018-07-18 12:20:28 -07:00
remote-ext.c	…
remote-fd.c	…
remote.c	Merge branch 'rs/opt-updates'	2018-08-27 14:33:43 -07:00
repack.c	Merge branch 'jt/repack-promisor-packs'	2018-08-20 12:40:31 -07:00
replace.c	Merge branch 'nd/i18n'	2018-08-15 15:08:23 -07:00
rerere.c	…
reset.c	Merge branch 'jm/cache-entry-from-mem-pool'	2018-08-02 15:30:43 -07:00
rev-list.c	Merge branch 'sb/object-store-lookup'	2018-08-02 15:30:42 -07:00
rev-parse.c	Merge branch 'sb/object-store-grafts'	2018-07-18 12:20:28 -07:00
revert.c	Merge branch 'nd/cherry-pick-quit-fix'	2018-08-20 12:41:34 -07:00
rm.c	Merge branch 'nd/no-the-index'	2018-08-20 11:33:53 -07:00
send-pack.c	Merge branch 'rs/opt-updates'	2018-08-27 14:33:43 -07:00
serve.c	…
shortlog.c	Merge branch 'rs/parse-opt-lithelp'	2018-08-17 13:09:56 -07:00
show-branch.c	Merge branch 'rs/parse-opt-lithelp'	2018-08-17 13:09:56 -07:00
show-index.c	make show-index a builtin	2018-05-29 00:28:22 +09:00
show-ref.c	…
stripspace.c	…
submodule--helper.c	Revert "Merge branch 'sb/submodule-core-worktree'"	2018-09-07 19:05:20 -07:00
symbolic-ref.c	…
tag.c	Merge branch 'sb/object-store-grafts'	2018-07-18 12:20:28 -07:00
unpack-file.c	…
unpack-objects.c	Merge branch 'jk/core-use-replace-refs'	2018-08-15 15:08:23 -07:00
update-index.c	Merge branch 'nd/no-the-index'	2018-08-20 11:33:53 -07:00
update-ref.c	update-ref --stdin: use skip_prefix()	2018-06-04 12:26:01 +09:00
update-server-info.c	…
upload-archive.c	archive.c: avoid access to the_index	2018-08-13 14:14:43 -07:00
upload-pack.c	check_replace_refs: rename to read_replace_refs	2018-07-18 15:45:14 -07:00
var.c	…
verify-commit.c	commit: add repository argument to lookup_commit	2018-06-29 10:43:39 -07:00
verify-pack.c	…
verify-tag.c	…
worktree.c	worktree: add --quiet option	2018-08-17 15:18:01 -07:00
write-tree.c	Merge branch 'rs/parse-opt-lithelp'	2018-08-17 13:09:56 -07:00