+ Junio
On Wed, Apr 12, 2017 at 1:00 PM, Stefan Beller <sbel...@google.com> wrote: > In submodule land we carefully need to distinguish between the path of a > submodule and its name. > > The path of a submodule is the path that is recorded in the working tree > of the superproject and describes where the submodule is bound to the > superprojects tree. > > The name as introduced in 941987a554 (git-submodule: give submodules > proper names, 2007-06-11) exists to track submodules across renames of > submodules. It is also used for the internal path in .git/modules/<name> > to store the git directory of the submodule inside the superproject. > > When looking up ref functions to use, I was confused which of the two > submodule properties are meant in the argument of the ref functions. > The context in which the functions were used however revealed it is the > path of the submodules. > > Rename the arguments to clearly describe what is expected as an input > argument. > > Signed-off-by: Stefan Beller <sbel...@google.com> > --- > refs.h | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/refs.h b/refs.h > index 3df0d45ebb..451f92958a 100644 > --- a/refs.h > +++ b/refs.h > @@ -86,7 +86,7 @@ int peel_ref(const char *refname, unsigned char *sha1); > * successful, return 0 and set sha1 to the name of the object; > * otherwise, return a non-zero value. > */ > -int resolve_gitlink_ref(const char *submodule, const char *refname, > +int resolve_gitlink_ref(const char *submodule_path, const char *refname, > unsigned char *sha1); > > /* > @@ -204,16 +204,16 @@ int for_each_glob_ref(each_ref_fn fn, const char > *pattern, void *cb_data); > int for_each_glob_ref_in(each_ref_fn fn, const char *pattern, > const char *prefix, void *cb_data); > > -int head_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data); > -int for_each_ref_submodule(const char *submodule, > +int head_ref_submodule(const char *submodule_path, each_ref_fn fn, void > *cb_data); > +int for_each_ref_submodule(const char *submodule_path, > each_ref_fn fn, void *cb_data); > -int for_each_ref_in_submodule(const char *submodule, const char *prefix, > +int for_each_ref_in_submodule(const char *submodule_path, const char *prefix, > each_ref_fn fn, void *cb_data); > -int for_each_tag_ref_submodule(const char *submodule, > +int for_each_tag_ref_submodule(const char *submodule_path, > each_ref_fn fn, void *cb_data); > -int for_each_branch_ref_submodule(const char *submodule, > +int for_each_branch_ref_submodule(const char *submodule_path, > each_ref_fn fn, void *cb_data); > -int for_each_remote_ref_submodule(const char *submodule, > +int for_each_remote_ref_submodule(const char *submodule_path, > each_ref_fn fn, void *cb_data); > > int head_ref_namespaced(each_ref_fn fn, void *cb_data); > -- > 2.12.2.603.g7b28dc31ba >
