delta/git.git, branch sb/submodule-move-nested

submodule: fixup nested submodules after moving the submodule

2018-03-29T16:44:51+00:00

connect_work_tree_and_git_dir is used to connect a submodule worktree with
its git directory and vice versa after events that require a reconnection
such as moving around the working tree. As submodules can have nested
submodules themselves, we'd also want to fix the nested submodules when
asked to. Add an option to recurse into the nested submodules and connect
them as well.

As submodules are identified by their name (which determines their git
directory in relation to their superproject's git directory) internally
and by their path in the working tree of the superproject, we need to
make sure that the mapping of name <-> path is kept intact. We can do
that in the git-mv command by writing out the gitmodules file first
and then forcing a reload of the submodule config machinery.

Signed-off-by: Stefan Beller 
Reviewed-by: Jonathan Tan 
Signed-off-by: Junio C Hamano

submodule-config: remove submodule_from_cache

2018-03-29T16:44:51+00:00

This continues the story of bf12fcdf5e (submodule-config: store
the_submodule_cache in the_repository, 2017-06-22).

The previous patch taught submodule_from_path to take a repository into
account, such that submodule_from_{path, cache} are the same now.
Remove submodule_from_cache, migrating all its callers to
submodule_from_path.

Reviewed-by: Jonathan Tan 
Signed-off-by: Stefan Beller 
Reviewed-by: Jonathan Tan 
Signed-off-by: Junio C Hamano

submodule-config: add repository argument to submodule_from_{name, path}

2018-03-29T16:44:50+00:00

This enables submodule_from_{name, path} to handle arbitrary repositories.
All callers just pass in the_repository, a later patch will pass in other
repos.

While at it remove the extern key word from the declarations.

Reviewed-by: Jonathan Tan 
Signed-off-by: Stefan Beller 
Reviewed-by: Jonathan Tan 
Signed-off-by: Junio C Hamano

submodule-config: allow submodule_free to handle arbitrary repositories

2018-03-29T16:44:50+00:00

At some point we may want to rename the function so that it describes what
it actually does as 'submodule_free' doesn't quite describe that this
clears a repository's submodule cache.  But that's beyond the scope of
this series.

While at it remove the extern key word from its declaration.

Signed-off-by: Stefan Beller 
Reviewed-by: Jonathan Tan 
Signed-off-by: Junio C Hamano

grep: remove "repo" arg from non-supporting funcs

2018-03-29T16:44:50+00:00

As part of commit f9ee2fcdfa ("grep: recurse in-process using 'struct
repository'", 2017-08-02), many functions in builtin/grep.c were
converted to also take "struct repository *" arguments. Among them were
grep_object() and grep_objects().

However, at least grep_objects() was converted incompletely - it calls
gitmodules_config_oid(), which references the_repository.

But it turns out that the conversion was extraneous anyway - there has
been no user-visible effect - because grep_objects() is never invoked
except with the_repository. This is because grepping through objects
cannot be done recursively into submodules.

Revert the changes to grep_objects() and grep_object() (which conversion
is also extraneous) to show that both these functions do not support
repositories other than the_repository.

Signed-off-by: Jonathan Tan 
Signed-off-by: Stefan Beller 
Reviewed-by: Jonathan Tan 
Signed-off-by: Junio C Hamano

submodule.h: drop declaration of connect_work_tree_and_git_dir

2018-03-29T16:44:50+00:00

The function connect_work_tree_and_git_dir is declared in both submodule.h
and dir.h, such that one of them is redundant. As the function is
implemented in dir.c, drop the declaration from submodule.h

Signed-off-by: Stefan Beller 
Reviewed-by: Jonathan Tan 
Signed-off-by: Junio C Hamano

sha1_file: allow sha1_loose_object_info to handle arbitrary repositories

2018-03-26T17:05:55+00:00

Signed-off-by: Stefan Beller 
Signed-off-by: Jonathan Nieder 
Signed-off-by: Junio C Hamano 
Signed-off-by: Nguyễn Thái Ngọc Duy 
Signed-off-by: Junio C Hamano

sha1_file: allow map_sha1_file to handle arbitrary repositories

2018-03-26T17:05:55+00:00

Signed-off-by: Stefan Beller 
Signed-off-by: Jonathan Nieder 
Signed-off-by: Junio C Hamano 
Signed-off-by: Nguyễn Thái Ngọc Duy 
Signed-off-by: Junio C Hamano

sha1_file: allow map_sha1_file_1 to handle arbitrary repositories

2018-03-26T17:05:55+00:00

Signed-off-by: Stefan Beller 
Signed-off-by: Jonathan Nieder 
Signed-off-by: Junio C Hamano 
Signed-off-by: Nguyễn Thái Ngọc Duy 
Signed-off-by: Junio C Hamano

sha1_file: allow open_sha1_file to handle arbitrary repositories

2018-03-26T17:05:55+00:00

Signed-off-by: Stefan Beller 
Signed-off-by: Jonathan Nieder 
Signed-off-by: Junio C Hamano 
Signed-off-by: Nguyễn Thái Ngọc Duy 
Signed-off-by: Junio C Hamano