repository object
PATCH v4 17/20 submodule: add repo_read_gitmodules
In reply to Brandon WilliamsTeach the repo object to be able to populate the submodule_cache by reading the repository's gitmodules file.
--- submodule.c | 15 +++++++++++++++ submodule.h | 2 ++ 2 files changed, 17 insertions(+)
submodule.c +15 -0
@@ -1,4 +1,5 @@#include "cache.h" +#include "repository.h" #include "config.h" #include "submodule-config.h" #include "submodule.h"
@@ -255,6 +256,20 @@ void gitmodules_config(void) } } +static int gitmodules_cb (const char *var,const char *value,void *data) +{ +struct repository *repo = data; +return submodule_config_option (repo, var, value); +} + +void repo_read_gitmodules (struct repository *repo) +{ +char *gitmodules_path =repo_worktree_path (repo,".gitmodules" ); + +git_config_from_file (gitmodules_cb, gitmodules_path, repo); +free (gitmodules_path); +} +void gitmodules_config_sha1 (const unsigned char *commit_sha1) {struct strbuf rev =STRBUF_INIT ;
submodule.h +2 -0
@@ -1,6 +1,7 @@#ifndef SUBMODULE_H #define SUBMODULE_H +struct repository ;struct diff_options ;struct argv_array ;struct oid_array ;
@@ -46,6 +47,7 @@ int option_parse_recurse_submodules_worktree_updater(const struct option *opt, const char *arg, int unset);void load_submodule_cache (void );extern void gitmodules_config (void ); +extern void repo_read_gitmodules (struct repository *repo);extern void gitmodules_config_sha1 (const unsigned char *commit_sha1);extern int is_submodule_initialized (const char *path);/*
Signature · 1 line
2.13.1.704.gde00cce3c-goog
PATCH v4 18/20 submodule: convert is_submodule_initialized to work on a repository
In reply to Brandon WilliamsConvert 'is_submodule_initialized()' to take a repository object and while we're at it, lets rename the function to 'is_submodule_active()' and remove the NEEDSWORK comment.
--- builtin/grep.c | 3 ++- builtin/submodule--helper.c | 9 +++++---- submodule.c | 20 ++++++++------------ submodule.h | 2 +- 4 files changed, 16 insertions(+), 18 deletions(-)
builtin/grep.c +2 -1
@@ -4,6 +4,7 @@* Copyright (c) 2006 Junio C Hamano */ #include "cache.h" +#include "repository.h" #include "config.h" #include "blob.h" #include "tree.h"
@@ -643,7 +644,7 @@ static int grep_submodule_launch(struct grep_opt *opt,static int grep_submodule (struct grep_opt *opt,const struct object_id *oid,const char *filename,const char *path) { -if (!is_submodule_initialized (path)) +if (!is_submodule_active (the_repository, path))return 0 ;if (!is_submodule_populated_gently (path,NULL )) {/*
builtin/submodule--helper.c +5 -4
@@ -1,4 +1,5 @@#include "builtin.h" +#include "repository.h" #include "cache.h" #include "config.h" #include "parse-options.h"
@@ -280,7 +281,7 @@ static void module_list_active(struct module_list *list)for (i =0 ; i < list->nr; i++) {const struct cache_entry *ce = list->entries[i]; -if (!is_submodule_initialized (ce->name)) +if (!is_submodule_active (the_repository, ce->name))continue ; ALLOC_GROW(active_modules.entries,
@@ -362,7 +363,7 @@ static void init_submodule(const char *path, const char *prefix, int quiet)* * Set active flag for the submodule being initialized */ -if (!is_submodule_initialized (path)) { +if (!is_submodule_active (the_repository, path)) {strbuf_reset (&sb);strbuf_addf (&sb,"submodule.%s.active" , sub->name);git_config_set_gently (sb.buf,"true" );
@@ -817,7 +818,7 @@ static int prepare_to_clone_next_submodule(const struct cache_entry *ce, }/* Check if the submodule has been initialized. */ -if (!is_submodule_initialized (ce->name)) { +if (!is_submodule_active (the_repository, ce->name)) {next_submodule_warn_missing (suc, out, displaypath); goto cleanup; }
@@ -1193,7 +1194,7 @@ static int is_active(int argc, const char **argv, const char *prefix)gitmodules_config (); -return !is_submodule_initialized (argv[1 ]); +return !is_submodule_active (the_repository, argv[1 ]); }#define SUPPORT_SUPER_PREFIX (1<<0)
submodule.c +8 -12
@@ -283,21 +283,17 @@ void gitmodules_config_sha1(const unsigned char *commit_sha1) }/* -* NEEDSWORK: With the addition of different configuration options to determine -* if a submodule is of interests, the validity of this function's name comes -* into question. Once the dust has settled and more concrete terminology is -* decided upon, come up with a more proper name for this function. One -* potential candidate could be 'is_submodule_active()'. -* * Determine if a submodule has been initialized at a given 'path' */ -int is_submodule_initialized (const char *path) +int is_submodule_active (struct repository *repo,const char *path) {int ret =0 ;char *key =NULL ;char *value =NULL ;const struct string_list *sl; -const struct submodule *module =submodule_from_path (null_sha1, path); +const struct submodule *module; + + module =submodule_from_cache (repo, null_sha1, path);/* early return if there isn't a path->module mapping */ if (!module)
@@ -305,14 +301,14 @@ int is_submodule_initialized(const char *path)/* submodule.<name>.active is set */ key =xstrfmt ("submodule.%s.active" , module->name); -if (!git_config_get_bool (key, &ret)) { +if (!repo_config_get_bool (repo, key, &ret)) {free (key);return ret; }free (key);/* submodule.active is set */ - sl =git_config_get_value_multi ("submodule.active" ); + sl =repo_config_get_value_multi (repo,"submodule.active" );if (sl) {struct pathspec ps;struct argv_array args =ARGV_ARRAY_INIT ;
@@ -332,7 +328,7 @@ int is_submodule_initialized(const char *path)/* fallback to checking if the URL is set */ key =xstrfmt ("submodule.%s.url" , module->name); - ret = !git_config_get_string (key, &value); + ret = !repo_config_get_string (repo, key, &value);free (value);free (key);
@@ -1532,7 +1528,7 @@ int submodule_move_head(const char *path,const struct submodule *sub;int *error_code_ptr, error_code; -if (!is_submodule_initialized (path)) +if (!is_submodule_active (the_repository, path))return 0 ;if (flags &SUBMODULE_MOVE_HEAD_FORCE )
submodule.h +1 -1
@@ -49,7 +49,7 @@ void load_submodule_cache(void);extern void gitmodules_config (void );extern void repo_read_gitmodules (struct repository *repo);extern void gitmodules_config_sha1 (const unsigned char *commit_sha1); -extern int is_submodule_initialized (const char *path); +extern int is_submodule_active (struct repository *repo,const char *path);/* * Determine if a submodule has been populated at a given 'path' by checking if * the <path>/.git resolves to a valid git repository.
Signature · 1 line
2.13.1.704.gde00cce3c-goog
PATCH v4 19/20 repository: enable initialization of submodules
In reply to Brandon WilliamsIntroduce 'repo_submodule_init()' which performs initialization of a 'struct repository' as a submodule of another 'struct repository'.
The resulting submodule 'struct repository' can be in one of three states:
1. The submodule is initialized and has a worktree.
2. The submodule is initialized but does not have a worktree. This would occur when the submodule's gitdir is present in the superproject's 'gitdir/modules/' directory yet the submodule has not been checked out in superproject's worktree.
3. The submodule remains uninitialized due to an error in the initialization process or there is no matching submodule at the provided path in the superproject.
--- repository.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ repository.h | 10 ++++++++++ 2 files changed, 64 insertions(+)
repository.c +54 -0
@@ -144,6 +144,58 @@ int repo_init(struct repository *repo, const char *gitdir, const char *worktree)return -1 ; } +/* +* Initialize 'submodule' as the submodule given by 'path' in parent repository +* 'superproject'. +* Return 0 upon success and a non-zero value upon failure. +*/ +int repo_submodule_init (struct repository *submodule, +struct repository *superproject, +const char *path) +{ +const struct submodule *sub; +struct strbuf gitdir =STRBUF_INIT ; +struct strbuf worktree =STRBUF_INIT ; +int ret =0 ; + + sub =submodule_from_cache (superproject, null_sha1, path); +if (!sub) { + ret =-1 ; + goto out; + } + +strbuf_repo_worktree_path (&gitdir, superproject,"%s/.git" , path); +strbuf_repo_worktree_path (&worktree, superproject,"%s" , path); + +if (repo_init (submodule, gitdir.buf, worktree.buf)) { +/* +* If initilization fails then it may be due to the submodule +* not being populated in the superproject's worktree. Instead +* we can try to initilize the submodule by finding it's gitdir +* in the superproject's 'modules' directory. In this case the +* submodule would not have a worktree. +*/ +strbuf_reset (&gitdir); +strbuf_repo_git_path (&gitdir, superproject, +"modules/%s" , sub->name); + +if (repo_init (submodule, gitdir.buf,NULL )) { + ret =-1 ; + goto out; + } + } + + submodule->submodule_prefix =xstrfmt ("%s%s/" , + superproject->submodule_prefix ? + superproject->submodule_prefix : +"" , path); + +out: +strbuf_release (&gitdir); +strbuf_release (&worktree); +return ret; +} +void repo_clear (struct repository *repo) {free (repo->gitdir);
@@ -158,6 +210,8 @@ void repo_clear(struct repository *repo) repo->index_file =NULL ;free (repo->worktree); repo->worktree =NULL ; +free (repo->submodule_prefix); + repo->submodule_prefix =NULL ;if (repo->config) {git_configset_clear (repo->config);
repository.h +10 -0
@@ -43,6 +43,13 @@ struct repository {*/ char *worktree; +/* +* Path from the root of the top-level superproject down to this +* repository. This is only non-NULL if the repository is initialized +* as a submodule of another repository. +*/ +char *submodule_prefix; +/* Subsystems */ /* * Repository's config which contains key-value pairs from the usual
@@ -80,6 +87,9 @@ extern struct repository *the_repository;extern void repo_set_gitdir (struct repository *repo,const char *path);extern void repo_set_worktree (struct repository *repo,const char *path);extern int repo_init (struct repository *repo,const char *gitdir,const char *worktree); +extern int repo_submodule_init (struct repository *submodule, +struct repository *superproject, +const char *path);extern void repo_clear (struct repository *repo);extern int repo_read_index (struct repository *repo);
Signature · 1 line
2.13.1.704.gde00cce3c-goog
PATCH v4 20/20 ls-files: use repository object
In reply to Brandon WilliamsConvert ls-files to use a repository struct and recurse submodules inprocess.
--- builtin/ls-files.c | 192 ++++++++++++++------------------- git.c | 2 +- t/t3007-ls-files-recurse-submodules.sh | 39 +++++++ 3 files changed, 118 insertions(+), 115 deletions(-)
builtin/ls-files.c +78 -114
@@ -5,7 +5,9 @@* * Copyright (C) Linus Torvalds, 2005 */ +#define NO_THE_INDEX_COMPATIBILITY_MACROS #include "cache.h" +#include "repository.h" #include "config.h" #include "quote.h" #include "dir.h"
@@ -32,10 +34,8 @@ static int line_terminator = '\n';static int debug_mode;static int show_eol;static int recurse_submodules; -static struct argv_array submodule_options =ARGV_ARRAY_INIT ;static const char *prefix; -static const char *super_prefix;static int max_prefix_len;static int prefix_len;static struct pathspec pathspec;
@@ -73,25 +73,12 @@ static void write_eolinfo(const struct index_state *istate,static void write_name (const char *name) { -/* -* Prepend the super_prefix to name to construct the full_name to be -* written. -*/ -struct strbuf full_name =STRBUF_INIT ; -if (super_prefix) { -strbuf_addstr (&full_name, super_prefix); -strbuf_addstr (&full_name, name); - name = full_name.buf; - } -/* * With "--full-name", prefix_len=0; this caller needs to pass * an empty string in that case (a NULL is good for ""). */ write_name_quoted_relative (name, prefix_len ? prefix :NULL , stdout, line_terminator); - -strbuf_release (&full_name); }static const char *get_tag (const struct cache_entry *ce,const char *tag)
@@ -210,83 +197,38 @@ static void show_killed_files(const struct index_state *istate, } } -/* -* Compile an argv_array with all of the options supported by --recurse_submodules -*/ -static void compile_submodule_options (const char **argv, -const struct dir_struct *dir, -int show_tag) -{ -if (line_terminator =='\0' ) -argv_array_push (&submodule_options,"-z" ); -if (show_tag) -argv_array_push (&submodule_options,"-t" ); -if (show_valid_bit) -argv_array_push (&submodule_options,"-v" ); -if (show_cached) -argv_array_push (&submodule_options,"--cached" ); -if (show_eol) -argv_array_push (&submodule_options,"--eol" ); -if (debug_mode) -argv_array_push (&submodule_options,"--debug" ); - -/* Add Pathspecs */ -argv_array_push (&submodule_options,"--" ); -for (; *argv; argv++) -argv_array_push (&submodule_options, *argv); -} +static void show_files (struct repository *repo,struct dir_struct *dir); -/** -* Recursively call ls-files on a submodule -*/ -static void show_gitlink (const struct cache_entry *ce) +static void show_submodule (struct repository *superproject, +struct dir_struct *dir,const char *path) { -struct child_process cp =CHILD_PROCESS_INIT ; -int status; -char *dir; - -prepare_submodule_repo_env (&cp.env_array); -argv_array_push (&cp.env_array,GIT_DIR_ENVIRONMENT ); - -if (prefix_len) -argv_array_pushf (&cp.env_array,"%s=%s" , -GIT_TOPLEVEL_PREFIX_ENVIRONMENT , - prefix); -argv_array_pushf (&cp.args,"--super-prefix=%s%s/" , - super_prefix ? super_prefix :"" , - ce->name); -argv_array_push (&cp.args,"ls-files" ); -argv_array_push (&cp.args,"--recurse-submodules" ); - -/* add supported options */ -argv_array_pushv (&cp.args, submodule_options.argv); - - cp.git_cmd =1 ; - dir =mkpathdup ("%s/%s" ,get_git_work_tree (), ce->name); - cp.dir = dir; - status =run_command (&cp); -free (dir); -if (status) -exit (status); +struct repository submodule; + +if (repo_submodule_init (&submodule, superproject, path)) +return ; + +if (repo_read_index (&submodule) <0 ) +die ("index file corrupt" ); + +repo_read_gitmodules (&submodule); + +show_files (&submodule, dir); + +repo_clear (&submodule); } -static void show_ce_entry (const struct index_state *istate, -const char *tag,const struct cache_entry *ce) +static void show_ce (struct repository *repo,struct dir_struct *dir, +const struct cache_entry *ce,const char *fullname, +const char *tag) { -struct strbuf name =STRBUF_INIT ; -int len = max_prefix_len; -if (super_prefix) -strbuf_addstr (&name, super_prefix); -strbuf_addstr (&name, ce->name); - -if (len >ce_namelen (ce)) +if (max_prefix_len >strlen (fullname))die ("git ls-files: internal error - cache entry not superset of prefix" );if (recurse_submodules &&S_ISGITLINK (ce->ce_mode) && -submodule_path_match (&pathspec, name.buf, ps_matched)) { -show_gitlink (ce); - }else if (match_pathspec (&pathspec, name.buf, name.len, - len, ps_matched, +is_submodule_active (repo, ce->name)) { +show_submodule (repo, dir, ce->name); + }else if (match_pathspec (&pathspec, fullname,strlen (fullname), + max_prefix_len, ps_matched,S_ISDIR (ce->ce_mode) ||S_ISGITLINK (ce->ce_mode))) { tag =get_tag (ce, tag);
@@ -300,12 +242,10 @@ static void show_ce_entry(const struct index_state *istate,find_unique_abbrev (ce->oid.hash, abbrev), ce_stage(ce)); } -write_eolinfo (istate, ce, ce->name); -write_name (ce->name); +write_eolinfo (repo->index, ce, fullname); +write_name (fullname);print_debug (ce); } - -strbuf_release (&name); }static void show_ru_info (const struct index_state *istate)
@@ -338,59 +278,79 @@ static void show_ru_info(const struct index_state *istate) }static int ce_excluded (struct dir_struct *dir,struct index_state *istate, -const struct cache_entry *ce) +const char *fullname,const struct cache_entry *ce) {int dtype =ce_to_dtype (ce); -return is_excluded (dir, istate, ce->name, &dtype); +return is_excluded (dir, istate, fullname, &dtype); +} + +static void construct_fullname (struct strbuf *out,const struct repository *repo, +const struct cache_entry *ce) +{ +strbuf_reset (out); +if (repo->submodule_prefix) +strbuf_addstr (out, repo->submodule_prefix); +strbuf_addstr (out, ce->name); } -static void show_files (struct index_state *istate,struct dir_struct *dir) +static void show_files (struct repository *repo,struct dir_struct *dir) {int i; +struct strbuf fullname =STRBUF_INIT ;/* For cached/deleted files we don't need to even do the readdir */ if (show_others || show_killed) {if (!show_others) dir->flags |=DIR_COLLECT_KILLED_ONLY ; -fill_directory (dir, istate, &pathspec); +fill_directory (dir, repo->index, &pathspec);if (show_others) -show_other_files (istate, dir); +show_other_files (repo->index, dir);if (show_killed) -show_killed_files (istate, dir); +show_killed_files (repo->index, dir); }if (show_cached || show_stage) { -for (i =0 ; i < istate->cache_nr; i++) { -const struct cache_entry *ce = istate->cache[i]; +for (i =0 ; i < repo->index->cache_nr; i++) { +const struct cache_entry *ce = repo->index->cache[i]; + +construct_fullname (&fullname, repo, ce); +if ((dir->flags &DIR_SHOW_IGNORED ) && - !ce_excluded (dir, istate, ce)) + !ce_excluded (dir, repo->index, fullname.buf, ce))continue ;if (show_unmerged && !ce_stage (ce))continue ;if (ce->ce_flags &CE_UPDATE )continue ; -show_ce_entry (istate,ce_stage (ce) ? tag_unmerged : - (ce_skip_worktree (ce) ? tag_skip_worktree : tag_cached), ce); +show_ce (repo, dir, ce, fullname.buf, +ce_stage (ce) ? tag_unmerged : + (ce_skip_worktree (ce) ? tag_skip_worktree : + tag_cached)); } }if (show_deleted || show_modified) { -for (i =0 ; i < istate->cache_nr; i++) { -const struct cache_entry *ce = istate->cache[i]; +for (i =0 ; i < repo->index->cache_nr; i++) { +const struct cache_entry *ce = repo->index->cache[i];struct stat st;int err; + +construct_fullname (&fullname, repo, ce); +if ((dir->flags &DIR_SHOW_IGNORED ) && - !ce_excluded (dir, istate, ce)) + !ce_excluded (dir, repo->index, fullname.buf, ce))continue ;if (ce->ce_flags &CE_UPDATE )continue ;if (ce_skip_worktree (ce))continue ; - err =lstat (ce->name, &st); + err =lstat (fullname.buf, &st);if (show_deleted && err) -show_ce_entry (istate, tag_removed, ce); -if (show_modified &&ie_modified (istate, ce, &st,0 )) -show_ce_entry (istate, tag_modified, ce); +show_ce (repo, dir, ce, fullname.buf, tag_removed); +if (show_modified &&ie_modified (repo->index, ce, &st,0 )) +show_ce (repo, dir, ce, fullname.buf, tag_modified); } } + +strbuf_release (&fullname); }/*
@@ -615,10 +575,9 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix) prefix = cmd_prefix;if (prefix) prefix_len =strlen (prefix); - super_prefix =get_super_prefix ();git_config (git_default_config,NULL ); -if (read_cache () <0 ) +if (repo_read_index (the_repository) <0 )die ("index file corrupt" ); argc = parse_options(argc, argv, prefix, builtin_ls_files_options,
@@ -652,7 +611,7 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)setup_work_tree ();if (recurse_submodules) -compile_submodule_options (argv, &dir, show_tag); +repo_read_gitmodules (the_repository); if (recurse_submodules && (show_stage || show_deleted || show_others || show_unmerged ||
@@ -670,7 +629,10 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)/* * Find common prefix for all pathspec's * This is used as a performance optimization which unfortunately cannot -* be done when recursing into submodules +* be done when recursing into submodules because when a pathspec is +* given which spans repository boundaries you can't simply remove the +* submodule entry because the pathspec may match something inside the +* submodule. */ if (recurse_submodules) max_prefix =NULL ;
@@ -678,7 +640,7 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix) max_prefix =common_prefix (&pathspec); max_prefix_len =get_common_prefix_len (max_prefix); -prune_index (&the_index, max_prefix, max_prefix_len); +prune_index (the_repository->index, max_prefix, max_prefix_len);/* Treat unmatching pathspec elements as errors */ if (pathspec.nr && error_unmatch)
@@ -699,11 +661,13 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)*/ if (show_stage || show_unmerged)die ("ls-files --with-tree is incompatible with -s or -u" ); -overlay_tree_on_index (&the_index, with_tree, max_prefix); +overlay_tree_on_index (the_repository->index, with_tree, max_prefix); } -show_files (&the_index, &dir); + +show_files (the_repository, &dir); +if (show_resolve_undo) -show_ru_info (&the_index); +show_ru_info (the_repository->index);if (ps_matched) {int bad;
git.c +1 -1
@@ -400,7 +400,7 @@ static struct cmd_struct commands[] = { { "init-db", cmd_init_db }, { "interpret-trailers", cmd_interpret_trailers, RUN_SETUP_GENTLY }, { "log", cmd_log, RUN_SETUP }, - { "ls-files", cmd_ls_files, RUN_SETUP | SUPPORT_SUPER_PREFIX }, + { "ls-files", cmd_ls_files, RUN_SETUP }, { "ls-remote", cmd_ls_remote, RUN_SETUP_GENTLY }, { "ls-tree", cmd_ls_tree, RUN_SETUP }, { "mailinfo", cmd_mailinfo, RUN_SETUP_GENTLY },
t/t3007-ls-files-recurse-submodules.sh +39 -0
@@ -135,6 +135,45 @@ test_expect_success '--recurse-submodules and pathspecs setup' ' test_cmp expect actual ' +test_expect_success 'inactive submodule' ' + test_when_finished "git config --bool submodule.submodule.active true" && + test_when_finished "git -C submodule config --bool submodule.subsub.active true" && + git config --bool submodule.submodule.active "false" && + + cat >expect <<-\EOF && + .gitmodules + a + b/b + h.txt + sib/file + sub/file + submodule + EOF + + git ls-files --recurse-submodules >actual && + test_cmp expect actual && + + git config --bool submodule.submodule.active "true" && + git -C submodule config --bool submodule.subsub.active "false" && + + cat >expect <<-\EOF && + .gitmodules + a + b/b + h.txt + sib/file + sub/file + submodule/.gitmodules + submodule/c + submodule/f.TXT + submodule/g.txt + submodule/subsub + EOF + + git ls-files --recurse-submodules >actual && + test_cmp expect actual +' + test_expect_success '--recurse-submodules and pathspecs' ' cat >expect <<-\EOF && h.txt
Signature · 1 line
2.13.1.704.gde00cce3c-goog
Quoted 13 lines · Brandon Williams
As before you can find this series at:
https://github.com/bmwill/git/tree/repository-objectChanges in v4:
* Patch 11 is slightly different and turns off all path relocation when a worktree is provided instead of just for the index file (Thanks for the help Jonathan Nieder).
* 'repo_init()' has a tighter API and now requires that the provided gitdir is a path to the gitdir instead of either a path to the gitdir or path to the worktree (which has a .git file or directory) (Thanks Jonathan Tan).
* Minor comment and commit message chagnes
Quoted 2 lines
Note: Like v3 this series is dependent on on 'bw/config-h' and
'bw/ls-files-sans-the-index'
I read the whole series and I consider it
Thanks,
Stefan
Quoted 13 lines · Brandon Williams
As before you can find this series at:
https://github.com/bmwill/git/tree/repository-objectChanges in v4:
* Patch 11 is slightly different and turns off all path relocation when a worktree is provided instead of just for the index file (Thanks for the help Jonathan Nieder).
* 'repo_init()' has a tighter API and now requires that the provided gitdir is a path to the gitdir instead of either a path to the gitdir or path to the worktree (which has a .git file or directory) (Thanks Jonathan Tan).
* Minor comment and commit message chagnes
Quoted 4 lines
Note: Like v3 this series is dependent on on 'bw/config-h' and
'bw/ls-files-sans-the-index'Brandon Williams (20):
I read thru the v1 and v4 versions. Very nice.
And thanks for splitting the earlier parts out
into independent patches.
I didn't have any complaints, but did want to ACK
that I had looked at it.
Jeff
Quoted 17 lines · Jeff Hostetler
Quoted 16 lines · Brandon Williams
As before you can find this series at:
https://github.com/bmwill/git/tree/repository-objectChanges in v4:
* Patch 11 is slightly different and turns off all path relocation when a worktree is provided instead of just for the index file (Thanks for the help Jonathan Nieder).
* 'repo_init()' has a tighter API and now requires that the provided gitdir is a path to the gitdir instead of either a path to the gitdir or path to the worktree (which has a .git file or directory) (Thanks Jonathan Tan).
* Minor comment and commit message chagnesNote: Like v3 this series is dependent on on 'bw/config-h' and
'bw/ls-files-sans-the-index'
Quoted 8 lines
Quoted 1 line
Brandon Williams (20):
I read thru the v1 and v4 versions. Very nice.
And thanks for splitting the earlier parts out
into independent patches.I didn't have any complaints, but did want to ACK
that I had looked at it.
Thanks.