global: drop external `the_index` variable
cover global: drop external `the_index` variable
Hi,
this patch series converts remaining users of the_index to stop using it, instead using the_repository->index. This gets rid of one more global variable and brings a project over the finish line that has started back in 2007.
I realize that this patch series is quite large, and that reviewers will eventually start to just gloss over things because the conversions are kind of boring, too. Also, due to the size it's quite likely to conflict with in-flight topics. So if you think that this is too large, please let me know and I will happily split this up into multiple series.
The motivation of these patches comes from the introduction of the ref format extension. I found it really hard to reason about the state of the_repository and would like to continue its deprecation in favor of explicitly passing down a struct repository *. Getting rid of the_index is a first easy step into that direction to make things more self-contained.
Patrick
Patrick Steinhardt (5):
t/helper: stop using the_index
builtin: stop using the_index
repository: initialize index in repo_init()
builtin/clone: stop using the_index
repository: drop global the_index variable
builtin/add.c | 48 +++++------ builtin/am.c | 36 ++++---- builtin/cat-file.c | 3 +- builtin/check-attr.c | 5 +- builtin/check-ignore.c | 7 +- builtin/checkout-index.c | 22 ++--- builtin/checkout.c | 87 ++++++++++--------- builtin/clean.c | 7 +- builtin/clone.c | 7 +- builtin/commit.c | 81 +++++++++--------- builtin/describe.c | 3 +- builtin/diff-tree.c | 3 +- builtin/diff.c | 6 +- builtin/difftool.c | 4 +- builtin/merge-index.c | 17 ++-- builtin/merge-tree.c | 3 +- builtin/merge.c | 31 ++++--- builtin/mv.c | 68 +++++++-------- builtin/pull.c | 4 +- builtin/read-tree.c | 15 ++-- builtin/rebase.c | 3 +- builtin/replay.c | 1 - builtin/reset.c | 32 +++---- builtin/rev-parse.c | 6 +- builtin/rm.c | 40 ++++----- builtin/stash.c | 45 +++++----- builtin/submodule--helper.c | 21 +++-- builtin/update-index.c | 122 +++++++++++++-------------- builtin/write-tree.c | 6 +- repository.c | 32 ++++--- repository.h | 3 - t/helper/test-cache-tree.c | 17 ++-- t/helper/test-dump-cache-tree.c | 5 +- t/helper/test-dump-split-index.c | 11 ++- t/helper/test-dump-untracked-cache.c | 3 +- t/helper/test-lazy-init-name-hash.c | 39 +++++---- t/helper/test-read-cache.c | 9 +- t/helper/test-scrap-cache-tree.c | 7 +- t/helper/test-write-cache.c | 3 +- 39 files changed, 420 insertions(+), 442 deletions(-)
Signature · 1 line
2.44.GIT
PATCH 1/5 t/helper: stop using `the_index`
Convert test-helper tools to use the_repository->index instead of the_index.
--- t/helper/test-cache-tree.c | 17 ++++++------ t/helper/test-dump-cache-tree.c | 5 ++-- t/helper/test-dump-split-index.c | 11 ++++---- t/helper/test-dump-untracked-cache.c | 3 +-- t/helper/test-lazy-init-name-hash.c | 39 ++++++++++++++-------------- t/helper/test-read-cache.c | 9 +++---- t/helper/test-scrap-cache-tree.c | 7 +++-- t/helper/test-write-cache.c | 3 +-- 8 files changed, 43 insertions(+), 51 deletions(-)
t/helper/test-cache-tree.c +8 -9
@@ -1,4 +1,3 @@ -#define USE_THE_INDEX_VARIABLE #include "test-tool.h" #include "gettext.h" #include "hex.h"
@@ -38,29 +37,29 @@ int cmd__cache_tree(int argc, const char **argv)if (repo_read_index (the_repository) <0 )die (_ ("unable to read index file" )); -oidcpy (&oid, &the_index.cache_tree->oid); +oidcpy (&oid, &the_repository->index->cache_tree->oid); tree =parse_tree_indirect (&oid);if (!tree)die (_ ("not a tree object: %s" ),oid_to_hex (&oid));if (empty) {/* clear the cache tree & allocate a new one */ -cache_tree_free (&the_index.cache_tree); - the_index.cache_tree =cache_tree (); +cache_tree_free (&the_repository->index->cache_tree); + the_repository->index->cache_tree =cache_tree (); }else if (invalidate_qty) {/* invalidate the specified number of unique paths */ -float f_interval = (float )the_index.cache_nr / invalidate_qty; +float f_interval = (float )the_repository->index->cache_nr / invalidate_qty;int interval = f_interval <1.0 ?1 : (int )f_interval; -for (i =0 ; i < invalidate_qty && i * interval < the_index.cache_nr; i++) -cache_tree_invalidate_path (&the_index, the_index.cache[i * interval]->name); +for (i =0 ; i < invalidate_qty && i * interval < the_repository->index->cache_nr; i++) +cache_tree_invalidate_path (the_repository->index, the_repository->index->cache[i * interval]->name); }if (argc !=1 )usage_with_options (test_cache_tree_usage, options);else if (!strcmp (argv[0 ],"prime" )) -prime_cache_tree (the_repository, &the_index, tree); +prime_cache_tree (the_repository, the_repository->index, tree);else if (!strcmp (argv[0 ],"update" )) -cache_tree_update (&the_index,WRITE_TREE_SILENT |WRITE_TREE_REPAIR ); +cache_tree_update (the_repository->index,WRITE_TREE_SILENT |WRITE_TREE_REPAIR );/* use "control" subcommand to specify no-op */ else if (!!strcmp (argv[0 ],"control" ))die (_ ("Unhandled subcommand '%s'" ), argv[0 ]);
t/helper/test-dump-cache-tree.c +2 -3
@@ -1,4 +1,3 @@ -#define USE_THE_INDEX_VARIABLE #include "test-tool.h" #include "hash.h" #include "hex.h"
@@ -68,10 +67,10 @@ int cmd__dump_cache_tree(int ac UNUSED, const char **av UNUSED)setup_git_directory ();if (repo_read_index (the_repository) <0 )die ("unable to read index file" ); - istate = the_index; + istate = *the_repository->index; istate.cache_tree = another;cache_tree_update (&istate,WRITE_TREE_DRY_RUN ); - ret =dump_cache_tree (the_index.cache_tree, another,"" ); + ret =dump_cache_tree (the_repository->index->cache_tree, another,"" );cache_tree_free (&another);return ret;
t/helper/test-dump-split-index.c +5 -6
@@ -1,4 +1,3 @@ -#define USE_THE_INDEX_VARIABLE #include "test-tool.h" #include "hex.h" #include "read-cache-ll.h"
@@ -19,16 +18,16 @@ int cmd__dump_split_index(int ac UNUSED, const char **av)setup_git_directory (); -do_read_index (&the_index, av[1 ],1 ); -printf ("own %s\n" ,oid_to_hex (&the_index.oid)); - si = the_index.split_index; +do_read_index (the_repository->index, av[1 ],1 ); +printf ("own %s\n" ,oid_to_hex (&the_repository->index->oid)); + si = the_repository->index->split_index;if (!si) {printf ("not a split index\n" );return 0 ; }printf ("base %s\n" ,oid_to_hex (&si->base_oid)); -for (i =0 ; i < the_index.cache_nr; i++) { -struct cache_entry *ce = the_index.cache[i]; +for (i =0 ; i < the_repository->index->cache_nr; i++) { +struct cache_entry *ce = the_repository->index->cache[i];printf ("%06o %s %d\t%s\n" , ce->ce_mode,oid_to_hex (&ce->oid),ce_stage (ce), ce->name); }
t/helper/test-dump-untracked-cache.c +1 -2
@@ -1,4 +1,3 @@ -#define USE_THE_INDEX_VARIABLE #include "test-tool.h" #include "dir.h" #include "hex.h"
@@ -56,7 +55,7 @@ int cmd__dump_untracked_cache(int ac UNUSED, const char **av UNUSED)setup_git_directory ();if (repo_read_index (the_repository) <0 )die ("unable to read index file" ); - uc = the_index.untracked; + uc = the_repository->index->untracked;if (!uc) {printf ("no untracked cache\n" );return 0 ;
t/helper/test-lazy-init-name-hash.c +19 -20
@@ -1,4 +1,3 @@ -#define USE_THE_INDEX_VARIABLE #include "test-tool.h" #include "environment.h" #include "name-hash.h"
@@ -40,22 +39,22 @@ static void dump_run(void)repo_read_index (the_repository);if (single) { -test_lazy_init_name_hash (&the_index,0 ); +test_lazy_init_name_hash (the_repository->index,0 ); }else { -int nr_threads_used =test_lazy_init_name_hash (&the_index,1 ); +int nr_threads_used =test_lazy_init_name_hash (the_repository->index,1 );if (!nr_threads_used)die ("non-threaded code path used" ); } -hashmap_for_each_entry (&the_index.dir_hash, &iter_dir, dir, +hashmap_for_each_entry (&the_repository->index->dir_hash, &iter_dir, dir, ent/* member name */ )printf ("dir %08x %7d %s\n" , dir->ent.hash, dir->nr, dir->name); -hashmap_for_each_entry (&the_index.name_hash, &iter_cache, ce, +hashmap_for_each_entry (&the_repository->index->name_hash, &iter_cache, ce, ent/* member name */ )printf ("name %08x %s\n" , ce->ent.hash, ce->name); -discard_index (&the_index); +discard_index (the_repository->index); }/*
@@ -74,7 +73,7 @@ static uint64_t time_runs(int try_threaded) t0 =getnanotime ();repo_read_index (the_repository); t1 =getnanotime (); - nr_threads_used =test_lazy_init_name_hash (&the_index, try_threaded); + nr_threads_used =test_lazy_init_name_hash (the_repository->index, try_threaded); t2 =getnanotime (); sum += (t2 - t1);
@@ -86,16 +85,16 @@ static uint64_t time_runs(int try_threaded)printf ("%f %f %d multi %d\n" , ((double )(t1 - t0))/1000000000 , ((double )(t2 - t1))/1000000000 , - the_index.cache_nr, + the_repository->index->cache_nr, nr_threads_used); else printf("%f %f %d single\n", ((double )(t1 - t0))/1000000000 , ((double )(t2 - t1))/1000000000 , - the_index.cache_nr); + the_repository->index->cache_nr);fflush (stdout); -discard_index (&the_index); +discard_index (the_repository->index); } avg = sum / count;
@@ -120,8 +119,8 @@ static void analyze_run(void)int nr;repo_read_index (the_repository); - cache_nr_limit = the_index.cache_nr; -discard_index (&the_index); + cache_nr_limit = the_repository->index->cache_nr; +discard_index (the_repository->index); nr = analyze;while (1 ) {
@@ -135,22 +134,22 @@ static void analyze_run(void)for (i =0 ; i < count; i++) {repo_read_index (the_repository); - the_index.cache_nr = nr;/* cheap truncate of index */ + the_repository->index->cache_nr = nr;/* cheap truncate of index */ t1s =getnanotime (); -test_lazy_init_name_hash (&the_index,0 ); +test_lazy_init_name_hash (the_repository->index,0 ); t2s =getnanotime (); sum_single += (t2s - t1s); - the_index.cache_nr = cache_nr_limit; -discard_index (&the_index); + the_repository->index->cache_nr = cache_nr_limit; +discard_index (the_repository->index);repo_read_index (the_repository); - the_index.cache_nr = nr;/* cheap truncate of index */ + the_repository->index->cache_nr = nr;/* cheap truncate of index */ t1m =getnanotime (); - nr_threads_used =test_lazy_init_name_hash (&the_index,1 ); + nr_threads_used =test_lazy_init_name_hash (the_repository->index,1 ); t2m =getnanotime (); sum_multi += (t2m - t1m); - the_index.cache_nr = cache_nr_limit; -discard_index (&the_index); + the_repository->index->cache_nr = cache_nr_limit; +discard_index (the_repository->index);if (!nr_threads_used) printf(" [size %8d] [single %f] non-threaded code path used\n",
t/helper/test-read-cache.c +4 -5
@@ -1,4 +1,3 @@ -#define USE_THE_INDEX_VARIABLE #include "test-tool.h" #include "config.h" #include "read-cache-ll.h"
@@ -27,16 +26,16 @@ int cmd__read_cache(int argc, const char **argv)if (name) {int pos; -refresh_index (&the_index,REFRESH_QUIET , +refresh_index (the_repository->index,REFRESH_QUIET ,NULL ,NULL ,NULL ); - pos =index_name_pos (&the_index, name,strlen (name)); + pos =index_name_pos (the_repository->index, name,strlen (name));if (pos <0 )die ("%s not in index" , name);printf ("%s is%s up to date\n" , name, -ce_uptodate (the_index.cache[pos]) ?"" :" not" ); +ce_uptodate (the_repository->index->cache[pos]) ?"" :" not" );write_file (name,"%d\n" , i); } -discard_index (&the_index); +discard_index (the_repository->index); }return 0 ; }
t/helper/test-scrap-cache-tree.c +3 -4
@@ -1,4 +1,3 @@ -#define USE_THE_INDEX_VARIABLE #include "test-tool.h" #include "lockfile.h" #include "read-cache-ll.h"
@@ -15,9 +14,9 @@ int cmd__scrap_cache_tree(int ac UNUSED, const char **av UNUSED)repo_hold_locked_index (the_repository, &index_lock,LOCK_DIE_ON_ERROR );if (repo_read_index (the_repository) <0 )die ("unable to read index file" ); -cache_tree_free (&the_index.cache_tree); - the_index.cache_tree =NULL ; -if (write_locked_index (&the_index, &index_lock,COMMIT_LOCK )) +cache_tree_free (&the_repository->index->cache_tree); + the_repository->index->cache_tree =NULL ; +if (write_locked_index (the_repository->index, &index_lock,COMMIT_LOCK ))die ("unable to write index file" );return 0 ; }
t/helper/test-write-cache.c +1 -2
@@ -1,4 +1,3 @@ -#define USE_THE_INDEX_VARIABLE #include "test-tool.h" #include "lockfile.h" #include "read-cache-ll.h"
@@ -16,7 +15,7 @@ int cmd__write_cache(int argc, const char **argv)for (i =0 ; i < cnt; i++) {repo_hold_locked_index (the_repository, &index_lock,LOCK_DIE_ON_ERROR ); -if (write_locked_index (&the_index, &index_lock,COMMIT_LOCK )) +if (write_locked_index (the_repository->index, &index_lock,COMMIT_LOCK ))die ("unable to write index file" ); }
Signature · 1 line
2.44.GIT
Re: [PATCH 1/5] t/helper: stop using `the_index`
Quoted 20 lines · Patrick Steinhardt
Convert test-helper tools to use
the_repository->indexinstead ofthe_index.Signed-off-by Patrick Steinhardt <[email protected]>--- t/helper/test-cache-tree.c | 17 ++++++------ t/helper/test-dump-cache-tree.c | 5 ++-- t/helper/test-dump-split-index.c | 11 ++++---- t/helper/test-dump-untracked-cache.c | 3 +-- t/helper/test-lazy-init-name-hash.c | 39 ++++++++++++++-------------- t/helper/test-read-cache.c | 9 +++---- t/helper/test-scrap-cache-tree.c | 7 +++-- t/helper/test-write-cache.c | 3 +-- 8 files changed, 43 insertions(+), 51 deletions(-)t/helper/test-cache-tree.c +0
-0
t/helper/test-cache-tree.c line 1
Quoted 2 lines
t/helper/test-cache-tree.c +0
-1@@ -1,4 +1,3 @@ -#define USE_THE_INDEX_VARIABLE
Nit: It would've been nice to mention what this macro is used for. Perhaps maybe in the cover letter since its removed from all the commits.
PATCH 2/5 builtin: stop using `the_index`
In reply to Patrick SteinhardtConvert builtins to use the_repository->index instead of the_index.
--- builtin/add.c | 48 +++++++------- builtin/am.c | 36 +++++------ builtin/cat-file.c | 3 +- builtin/check-attr.c | 5 +- builtin/check-ignore.c | 7 +-- builtin/checkout-index.c | 22 +++---- builtin/checkout.c | 87 +++++++++++++------------ builtin/clean.c | 7 +-- builtin/commit.c | 81 ++++++++++++------------ builtin/describe.c | 3 +- builtin/diff-tree.c | 3 +- builtin/diff.c | 6 +- builtin/difftool.c | 4 +- builtin/merge-index.c | 17 +++-- builtin/merge-tree.c | 3 +- builtin/merge.c | 31 +++++---- builtin/mv.c | 68 ++++++++++---------- builtin/pull.c | 4 +- builtin/read-tree.c | 15 +++-- builtin/rebase.c | 3 +- builtin/replay.c | 1 - builtin/reset.c | 32 +++++----- builtin/rev-parse.c | 6 +- builtin/rm.c | 40 ++++++------ builtin/stash.c | 45 +++++++------ builtin/submodule--helper.c | 21 +++---- builtin/update-index.c | 122 ++++++++++++++++++------------------ builtin/write-tree.c | 6 +- 28 files changed, 355 insertions(+), 371 deletions(-)
builtin/add.c +24 -24
@@ -3,7 +3,7 @@* * Copyright (C) 2006 Linus Torvalds */ -#define USE_THE_INDEX_VARIABLE +#include "builtin.h" #include "advice.h" #include "config.h"
@@ -40,20 +40,20 @@ static int chmod_pathspec(struct pathspec *pathspec, char flip, int show_only) {int i, ret =0 ; -for (i =0 ; i < the_index.cache_nr; i++) { -struct cache_entry *ce = the_index.cache[i]; +for (i =0 ; i < the_repository->index->cache_nr; i++) { +struct cache_entry *ce = the_repository->index->cache[i];int err;if (!include_sparse && (ce_skip_worktree (ce) || - !path_in_sparse_checkout (ce->name, &the_index))) + !path_in_sparse_checkout (ce->name, the_repository->index)))continue ; -if (pathspec && !ce_path_match (&the_index, ce, pathspec,NULL )) +if (pathspec && !ce_path_match (the_repository->index, ce, pathspec,NULL ))continue ;if (!show_only) - err =chmod_index_entry (&the_index, ce, flip); + err =chmod_index_entry (the_repository->index, ce, flip);else err =S_ISREG (ce->ce_mode) ?0 :-1 ;
@@ -68,20 +68,20 @@ static int renormalize_tracked_files(const struct pathspec *pathspec, int flags) {int i, retval =0 ; -for (i =0 ; i < the_index.cache_nr; i++) { -struct cache_entry *ce = the_index.cache[i]; +for (i =0 ; i < the_repository->index->cache_nr; i++) { +struct cache_entry *ce = the_repository->index->cache[i];if (!include_sparse && (ce_skip_worktree (ce) || - !path_in_sparse_checkout (ce->name, &the_index))) + !path_in_sparse_checkout (ce->name, the_repository->index)))continue ;if (ce_stage (ce))continue ;/* do not touch unmerged paths */ if (!S_ISREG (ce->ce_mode) && !S_ISLNK (ce->ce_mode))continue ;/* do not touch non blobs */ -if (pathspec && !ce_path_match (&the_index, ce, pathspec,NULL )) +if (pathspec && !ce_path_match (the_repository->index, ce, pathspec,NULL ))continue ; - retval |=add_file_to_index (&the_index, ce->name, + retval |=add_file_to_index (the_repository->index, ce->name, flags |ADD_CACHE_RENORMALIZE ); }
@@ -100,11 +100,11 @@ static char *prune_directory(struct dir_struct *dir, struct pathspec *pathspec, i = dir->nr;while (--i >=0 ) {struct dir_entry *entry = *src++; -if (dir_path_match (&the_index, entry, pathspec, prefix, seen)) +if (dir_path_match (the_repository->index, entry, pathspec, prefix, seen)) *dst++ = entry; } dir->nr = dst - dir->entries; -add_pathspec_matches_against_index (pathspec, &the_index, seen, +add_pathspec_matches_against_index (pathspec, the_repository->index, seen,PS_IGNORE_SKIP_WORKTREE );return seen; }
@@ -119,14 +119,14 @@ static int refresh(int verbose, const struct pathspec *pathspec) (verbose ?REFRESH_IN_PORCELAIN :REFRESH_QUIET ); seen =xcalloc (pathspec->nr,1 ); -refresh_index (&the_index, flags, pathspec, seen, +refresh_index (the_repository->index, flags, pathspec, seen,_ ("Unstaged changes after refreshing the index:" ));for (i =0 ; i < pathspec->nr; i++) {if (!seen[i]) {const char *path = pathspec->items[i].original;if (matches_skip_worktree (pathspec, i, &skip_worktree_seen) || - !path_in_sparse_checkout (path, &the_index)) { + !path_in_sparse_checkout (path, the_repository->index)) {string_list_append (&only_match_skip_worktree, pathspec->items[i].original); }else {
@@ -335,12 +335,12 @@ static int add_files(struct dir_struct *dir, int flags)for (i =0 ; i < dir->nr; i++) {if (!include_sparse && - !path_in_sparse_checkout (dir->entries[i]->name, &the_index)) { + !path_in_sparse_checkout (dir->entries[i]->name, the_repository->index)) {string_list_append (&matched_sparse_paths, dir->entries[i]->name);continue ; } -if (add_file_to_index (&the_index, dir->entries[i]->name, flags)) { +if (add_file_to_index (the_repository->index, dir->entries[i]->name, flags)) {if (!ignore_add_errors)die (_ ("adding files failed" )); exit_status =1 ;
@@ -457,8 +457,8 @@ int cmd_add(int argc, const char **argv, const char *prefix)if (repo_read_index_preload (the_repository, &pathspec,0 ) <0 )die (_ ("index file corrupt" )); -die_in_unpopulated_submodule (&the_index, prefix); -die_path_inside_submodule (&the_index, &pathspec); +die_in_unpopulated_submodule (the_repository->index, prefix); +die_path_inside_submodule (the_repository->index, &pathspec);if (add_new_files) {int baselen;
@@ -470,7 +470,7 @@ int cmd_add(int argc, const char **argv, const char *prefix) }/* This picks up the paths that are not tracked */ - baselen =fill_directory (&dir, &the_index, &pathspec); + baselen =fill_directory (&dir, the_repository->index, &pathspec);if (pathspec.nr) seen =prune_directory (&dir, &pathspec, baselen); }
@@ -487,7 +487,7 @@ int cmd_add(int argc, const char **argv, const char *prefix)if (!seen) seen =find_pathspecs_matching_against_index (&pathspec, - &the_index,PS_IGNORE_SKIP_WORKTREE ); + the_repository->index,PS_IGNORE_SKIP_WORKTREE );/* * file_exists() assumes exact match
@@ -523,8 +523,8 @@ int cmd_add(int argc, const char **argv, const char *prefix) !file_exists(path)) {if (ignore_missing) {int dtype =DT_UNKNOWN ; -if (is_excluded (&dir, &the_index, path, &dtype)) -dir_add_ignored (&dir, &the_index, +if (is_excluded (&dir, the_repository->index, path, &dtype)) +dir_add_ignored (&dir, the_repository->index, path, pathspec.items[i].len); }else die(_("pathspec '%s' did not match any files"),
@@ -560,7 +560,7 @@ int cmd_add(int argc, const char **argv, const char *prefix)end_odb_transaction (); finish: -if (write_locked_index (&the_index, &lock_file, +if (write_locked_index (the_repository->index, &lock_file,COMMIT_LOCK |SKIP_IF_UNCHANGED ))die (_ ("unable to write new index file" ));
builtin/am.c +18 -18
@@ -3,7 +3,7 @@* * Based on git-am.sh by Junio C Hamano. */ -#define USE_THE_INDEX_VARIABLE +#include "builtin.h" #include "abspath.h" #include "advice.h"
@@ -1536,8 +1536,8 @@ static int run_apply(const struct am_state *state, const char *index_file)if (index_file) {/* Reload index as apply_all_patches() will have modified it. */ -discard_index (&the_index); -read_index_from (&the_index, index_file,get_git_dir ()); +discard_index (the_repository->index); +read_index_from (the_repository->index, index_file,get_git_dir ()); }return 0 ;
@@ -1579,10 +1579,10 @@ static int fall_back_threeway(const struct am_state *state, const char *index_paif (build_fake_ancestor (state, index_path))return error ("could not build fake ancestor" ); -discard_index (&the_index); -read_index_from (&the_index, index_path,get_git_dir ()); +discard_index (the_repository->index); +read_index_from (the_repository->index, index_path,get_git_dir ()); -if (write_index_as_tree (&orig_tree, &the_index, index_path,0 ,NULL )) +if (write_index_as_tree (&orig_tree, the_repository->index, index_path,0 ,NULL ))return error (_ ("Repository lacks necessary blobs to fall back on 3-way merge." ));say (state, stdout,_ ("Using index info to reconstruct a base tree..." ));
@@ -1608,12 +1608,12 @@ static int fall_back_threeway(const struct am_state *state, const char *index_pareturn error (_ ("Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." )); -if (write_index_as_tree (&their_tree, &the_index, index_path,0 ,NULL )) +if (write_index_as_tree (&their_tree, the_repository->index, index_path,0 ,NULL ))return error ("could not write tree" );say (state, stdout,_ ("Falling back to patching base and 3-way merge..." )); -discard_index (&the_index); +discard_index (the_repository->index);repo_read_index (the_repository);/*
@@ -1660,7 +1660,7 @@ static void do_commit(const struct am_state *state)if (!state->no_verify &&run_hooks ("pre-applypatch" ))exit (1 ); -if (write_index_as_tree (&tree, &the_index,get_index_file (),0 ,NULL )) +if (write_index_as_tree (&tree, the_repository->index,get_index_file (),0 ,NULL ))die (_ ("git write-tree failed to write a tree" ));if (!repo_get_oid_commit (the_repository,"HEAD" , &parent)) {
@@ -1948,7 +1948,7 @@ static void am_resolve(struct am_state *state, int allow_empty) } } -if (unmerged_index (&the_index)) { +if (unmerged_index (the_repository->index)) {printf_ln (_ ("You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as such.\n" "You might run `git rm` on a file to accept \"deleted by them\" for it." ));
@@ -1987,12 +1987,12 @@ static int fast_forward_to(struct tree *head, struct tree *remote, int reset)repo_hold_locked_index (the_repository, &lock_file,LOCK_DIE_ON_ERROR ); -refresh_index (&the_index,REFRESH_QUIET ,NULL ,NULL ,NULL ); +refresh_index (the_repository->index,REFRESH_QUIET ,NULL ,NULL ,NULL );memset (&opts,0 ,sizeof (opts)); opts.head_idx =1 ; - opts.src_index = &the_index; - opts.dst_index = &the_index; + opts.src_index = the_repository->index; + opts.dst_index = the_repository->index; opts.update =1 ; opts.merge =1 ; opts.reset = reset ?UNPACK_RESET_PROTECT_UNTRACKED :0 ;
@@ -2006,7 +2006,7 @@ static int fast_forward_to(struct tree *head, struct tree *remote, int reset)return -1 ; } -if (write_locked_index (&the_index, &lock_file,COMMIT_LOCK )) +if (write_locked_index (the_repository->index, &lock_file,COMMIT_LOCK ))die (_ ("unable to write new index file" ));return 0 ;
@@ -2029,8 +2029,8 @@ static int merge_tree(struct tree *tree)memset (&opts,0 ,sizeof (opts)); opts.head_idx =1 ; - opts.src_index = &the_index; - opts.dst_index = &the_index; + opts.src_index = the_repository->index; + opts.dst_index = the_repository->index; opts.merge =1 ; opts.fn = oneway_merge;init_tree_desc (&t[0 ], &tree->object.oid, tree->buffer, tree->size);
@@ -2040,7 +2040,7 @@ static int merge_tree(struct tree *tree)return -1 ; } -if (write_locked_index (&the_index, &lock_file,COMMIT_LOCK )) +if (write_locked_index (the_repository->index, &lock_file,COMMIT_LOCK ))die (_ ("unable to write new index file" ));return 0 ;
@@ -2068,7 +2068,7 @@ static int clean_index(const struct object_id *head, const struct object_id *remif (fast_forward_to (head_tree, head_tree,1 ))return -1 ; -if (write_index_as_tree (&index, &the_index,get_index_file (),0 ,NULL )) +if (write_index_as_tree (&index, the_repository->index,get_index_file (),0 ,NULL ))return -1 ; index_tree =parse_tree_indirect (&index);
builtin/cat-file.c +1 -2
@@ -3,7 +3,6 @@* * Copyright (C) Linus Torvalds, 2005 */ -#define USE_THE_INDEX_VARIABLE #include "builtin.h" #include "config.h" #include "convert.h"
@@ -77,7 +76,7 @@ static int filter_object(const char *path, unsigned mode,struct checkout_metadata meta;init_checkout_metadata (&meta,NULL ,NULL , oid); -if (convert_to_working_tree (&the_index, path, *buf, *size, &strbuf, &meta)) { +if (convert_to_working_tree (the_repository->index, path, *buf, *size, &strbuf, &meta)) {free (*buf); *size = strbuf.len; *buf =strbuf_detach (&strbuf,NULL );
builtin/check-attr.c +2 -3
@@ -1,4 +1,3 @@ -#define USE_THE_INDEX_VARIABLE #include "builtin.h" #include "config.h" #include "attr.h"
@@ -71,9 +70,9 @@ static void check_attr(const char *prefix, struct attr_check *check,prefix_path (prefix, prefix ?strlen (prefix) :0 , file);if (collect_all) { -git_all_attrs (&the_index, full_path, check); +git_all_attrs (the_repository->index, full_path, check); }else { -git_check_attr (&the_index, full_path, check); +git_check_attr (the_repository->index, full_path, check); }output_attr (check, file);
builtin/check-ignore.c +3 -4
@@ -1,4 +1,3 @@ -#define USE_THE_INDEX_VARIABLE #include "builtin.h" #include "config.h" #include "dir.h"
@@ -95,21 +94,21 @@ static int check_ignore(struct dir_struct *dir,PATHSPEC_KEEP_ORDER , prefix, argv); -die_path_inside_submodule (&the_index, &pathspec); +die_path_inside_submodule (the_repository->index, &pathspec);/* * look for pathspecs matching entries in the index, since these * should not be ignored, in order to be consistent with * 'git status', 'git add' etc. */ - seen =find_pathspecs_matching_against_index (&pathspec, &the_index, + seen =find_pathspecs_matching_against_index (&pathspec, the_repository->index,PS_HEED_SKIP_WORKTREE );for (i =0 ; i < pathspec.nr; i++) { full_path = pathspec.items[i].match; pattern =NULL ;if (!seen[i]) {int dtype =DT_UNKNOWN ; - pattern =last_matching_pattern (dir, &the_index, + pattern =last_matching_pattern (dir, the_repository->index, full_path, &dtype);if (!verbose && pattern && pattern->flags &PATTERN_FLAG_NEGATIVE )
builtin/checkout-index.c +11 -11
@@ -4,7 +4,7 @@* Copyright (C) 2005 Linus Torvalds * */ -#define USE_THE_INDEX_VARIABLE +#include "builtin.h" #include "config.h" #include "gettext.h"
@@ -69,7 +69,7 @@ static void write_tempfile_record(const char *name, const char *prefix)static int checkout_file (const char *name,const char *prefix) {int namelen =strlen (name); -int pos =index_name_pos (&the_index, name, namelen); +int pos =index_name_pos (the_repository->index, name, namelen);int has_same_name =0 ;int is_file =0 ;int is_skipped =1 ;
@@ -79,8 +79,8 @@ static int checkout_file(const char *name, const char *prefix)if (pos <0 ) pos = -pos -1 ; -while (pos < the_index.cache_nr) { -struct cache_entry *ce = the_index.cache[pos]; +while (pos <the_repository->index->cache_nr) { +struct cache_entry *ce =the_repository->index->cache[pos];if (ce_namelen (ce) != namelen ||memcmp (ce->name, name, namelen))break ;
@@ -140,8 +140,8 @@ static int checkout_all(const char *prefix, int prefix_length)int i, errs =0 ;struct cache_entry *last_ce =NULL ; -for (i =0 ; i < the_index.cache_nr ; i++) { -struct cache_entry *ce = the_index.cache[i]; +for (i =0 ; i < the_repository->index->cache_nr ; i++) { +struct cache_entry *ce = the_repository->index->cache[i];if (S_ISSPARSEDIR (ce->ce_mode)) {if (!ce_skip_worktree (ce))
@@ -154,8 +154,8 @@ static int checkout_all(const char *prefix, int prefix_length)* first entry inside the expanded sparse directory). */ if (ignore_skip_worktree) { -ensure_full_index (&the_index); - ce = the_index.cache[i]; +ensure_full_index (the_repository->index); + ce = the_repository->index->cache[i]; } }
@@ -260,7 +260,7 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix) argc =parse_options (argc, argv, prefix, builtin_checkout_index_options, builtin_checkout_index_usage,0 ); - state.istate = &the_index; + state.istate = the_repository->index; state.force = force; state.quiet = quiet; state.not_new = not_new;
@@ -280,7 +280,7 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix)*/ if (index_opt && !state.base_dir_len && !to_tempfile) { state.refresh_cache =1 ; - state.istate = &the_index; + state.istate = the_repository->index;repo_hold_locked_index (the_repository, &lock_file,LOCK_DIE_ON_ERROR ); }
@@ -339,7 +339,7 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix)return 1 ;if (is_lock_file_locked (&lock_file) && -write_locked_index (&the_index, &lock_file,COMMIT_LOCK )) +write_locked_index (the_repository->index, &lock_file,COMMIT_LOCK ))die ("Unable to write new index file" );return 0 ; }
builtin/checkout.c +43 -44
250 lines not on this page · raw message
builtin/clean.c +3 -4
@@ -6,7 +6,6 @@* Based on git-clean.sh by Pavel Roskin */ -#define USE_THE_INDEX_VARIABLE #include "builtin.h" #include "abspath.h" #include "config.h"
@@ -714,7 +713,7 @@ static int filter_by_patterns_cmd(void)for_each_string_list_item (item, &del_list) {int dtype =DT_UNKNOWN ; -if (is_excluded (&dir, &the_index, item->string, &dtype)) { +if (is_excluded (&dir, the_repository->index, item->string, &dtype)) { *item->string ='\0' ; changed++; }
@@ -1021,7 +1020,7 @@ int cmd_clean(int argc, const char **argv, const char *prefix)PATHSPEC_PREFER_CWD , prefix, argv); -fill_directory (&dir, &the_index, &pathspec); +fill_directory (&dir, the_repository->index, &pathspec);correct_untracked_entries (&dir);for (i =0 ; i < dir.nr; i++) {
@@ -1029,7 +1028,7 @@ int cmd_clean(int argc, const char **argv, const char *prefix)struct stat st;const char *rel; -if (!index_name_is_other (&the_index, ent->name, ent->len)) +if (!index_name_is_other (the_repository->index, ent->name, ent->len))continue ;if (lstat (ent->name, &st))
builtin/commit.c +40 -41
208 lines not on this page · raw message
builtin/describe.c +1 -2
@@ -1,4 +1,3 @@ -#define USE_THE_INDEX_VARIABLE #include "builtin.h" #include "config.h" #include "environment.h"
@@ -674,7 +673,7 @@ int cmd_describe(int argc, const char **argv, const char *prefix)prepare_repo_settings (the_repository); the_repository->settings.command_requires_full_index =0 ;repo_read_index (the_repository); -refresh_index (&the_index,REFRESH_QUIET |REFRESH_UNMERGED , +refresh_index (the_repository->index,REFRESH_QUIET |REFRESH_UNMERGED ,NULL ,NULL ,NULL ); fd =repo_hold_locked_index (the_repository, &index_lock,0 );
builtin/diff-tree.c +1 -2
@@ -1,4 +1,3 @@ -#define USE_THE_INDEX_VARIABLE #include "builtin.h" #include "config.h" #include "diff.h"
@@ -206,7 +205,7 @@ int cmd_diff_tree(int argc, const char **argv, const char *prefix) opt->diffopt.rotate_to_strict =0 ; opt->diffopt.no_free =1 ;if (opt->diffopt.detect_rename) { -if (!the_index.cache) +if (the_repository->index->cache)repo_read_index (the_repository); opt->diffopt.setup |=DIFF_SETUP_USE_SIZE_CACHE ; }
builtin/diff.c +3 -3
@@ -3,7 +3,7 @@* * Copyright (c) 2006 Junio C Hamano */ -#define USE_THE_INDEX_VARIABLE +#include "builtin.h" #include "config.h" #include "ewah/ewok.h"
@@ -239,9 +239,9 @@ static void refresh_index_quietly(void) fd =repo_hold_locked_index (the_repository, &lock_file,0 );if (fd <0 )return ; -discard_index (&the_index); +discard_index (the_repository->index);repo_read_index (the_repository); -refresh_index (&the_index,REFRESH_QUIET |REFRESH_UNMERGED ,NULL ,NULL , +refresh_index (the_repository->index,REFRESH_QUIET |REFRESH_UNMERGED ,NULL ,NULL ,NULL );repo_update_index_if_able (the_repository, &lock_file); }
builtin/difftool.c +2 -2
@@ -11,7 +11,7 @@* * Copyright (C) 2016 Johannes Schindelin */ -#define USE_THE_INDEX_VARIABLE +#include "builtin.h" #include "abspath.h" #include "config.h"
@@ -117,7 +117,7 @@ static int use_wt_file(const char *workdir, const char *name,int fd =open (buf.buf,O_RDONLY );if (fd >=0 && - !index_fd (&the_index, &wt_oid, fd, &st,OBJ_BLOB , name,0 )) { + !index_fd (the_repository->index, &wt_oid, fd, &st,OBJ_BLOB , name,0 )) {if (is_null_oid (oid)) {oidcpy (oid, &wt_oid); use =1 ;
builtin/merge-index.c +8 -9
@@ -1,4 +1,3 @@ -#define USE_THE_INDEX_VARIABLE #include "builtin.h" #include "hex.h" #include "read-cache-ll.h"
@@ -18,11 +17,11 @@ static int merge_entry(int pos, const char *path)char ownbuf[4 ][60 ];struct child_process cmd =CHILD_PROCESS_INIT ; -if (pos >= the_index.cache_nr) +if (pos >= the_repository->index->cache_nr)die ("git merge-index: %s not in the cache" , path); found =0 ; do { - const struct cache_entry *ce = the_index.cache[pos]; + const struct cache_entry *ce = the_repository->index->cache[pos]; int stage = ce_stage(ce); if (strcmp(ce->name, path))
@@ -32,7 +31,7 @@ static int merge_entry(int pos, const char *path)xsnprintf (ownbuf[stage],sizeof (ownbuf[stage]),"%o" , ce->ce_mode); arguments[stage] = hexbuf[stage]; arguments[stage +4 ] = ownbuf[stage]; - }while (++pos < the_index.cache_nr); + }while (++pos < the_repository->index->cache_nr);if (!found)die ("git merge-index: %s not in the cache" , path);
@@ -51,7 +50,7 @@ static int merge_entry(int pos, const char *path)static void merge_one_path (const char *path) { -int pos =index_name_pos (&the_index, path,strlen (path)); +int pos =index_name_pos (the_repository->index, path,strlen (path));/* * If it already exists in the cache as stage0, it's
@@ -65,9 +64,9 @@ static void merge_all(void) {int i;/* TODO: audit for interaction with sparse-index. */ -ensure_full_index (&the_index); -for (i =0 ; i < the_index.cache_nr; i++) { -const struct cache_entry *ce = the_index.cache[i]; +ensure_full_index (the_repository->index); +for (i =0 ; i < the_repository->index->cache_nr; i++) { +const struct cache_entry *ce = the_repository->index->cache[i];if (!ce_stage (ce))continue ; i +=merge_entry (i, ce->name)-1 ;
@@ -89,7 +88,7 @@ int cmd_merge_index(int argc, const char **argv, const char *prefix UNUSED)repo_read_index (the_repository);/* TODO: audit for interaction with sparse-index. */ -ensure_full_index (&the_index); +ensure_full_index (the_repository->index); i =1 ;if (!strcmp (argv[i],"-o" )) {
builtin/merge-tree.c +1 -2
@@ -1,4 +1,3 @@ -#define USE_THE_INDEX_VARIABLE #include "builtin.h" #include "tree-walk.h" #include "xdiff-interface.h"
@@ -364,7 +363,7 @@ static void trivial_merge_trees(struct tree_desc t[3], const char *base)setup_traverse_info (&info, base); info.fn = threeway_callback; -traverse_trees (&the_index,3 , t, &info); +traverse_trees (the_repository->index,3 , t, &info); } static void *get_tree_descriptor(struct repository *r,
builtin/merge.c +15 -16
@@ -6,7 +6,6 @@* Based on git-merge.sh by Junio C Hamano. */ -#define USE_THE_INDEX_VARIABLE #include "builtin.h" #include "abspath.h" #include "advice.h"
@@ -300,7 +299,7 @@ static int save_state(struct object_id *stash)int rc =-1 ; fd =repo_hold_locked_index (the_repository, &lock_file,0 ); -refresh_index (&the_index,REFRESH_QUIET ,NULL ,NULL ,NULL ); +refresh_index (the_repository->index,REFRESH_QUIET ,NULL ,NULL ,NULL );if (0 <= fd)repo_update_index_if_able (the_repository, &lock_file);rollback_lock_file (&lock_file);
@@ -372,7 +371,7 @@ static void restore_state(const struct object_id *head,run_command (&cmd); refresh_cache: -discard_index (&the_index); +discard_index (the_repository->index);if (repo_read_index (the_repository) <0 )die (_ ("could not read index" )); }
@@ -657,8 +656,8 @@ static int read_tree_trivial(struct object_id *common, struct object_id *head,memset (&opts,0 ,sizeof (opts)); opts.head_idx =2 ; - opts.src_index = &the_index; - opts.dst_index = &the_index; + opts.src_index = the_repository->index; + opts.dst_index = the_repository->index; opts.update =1 ; opts.verbose_update =1 ; opts.trivial_merges_only =1 ;
@@ -674,7 +673,7 @@ static int read_tree_trivial(struct object_id *common, struct object_id *head,if (!trees[nr_trees++])return -1 ; opts.fn = threeway_merge; -cache_tree_free (&the_index.cache_tree); +cache_tree_free (&the_repository->index->cache_tree);for (i =0 ; i < nr_trees; i++) {parse_tree (trees[i]); init_tree_desc(t+i, &trees[i]->object.oid,
@@ -687,7 +686,7 @@ static int read_tree_trivial(struct object_id *common, struct object_id *head,static void write_tree_trivial (struct object_id *oid) { -if (write_index_as_tree (oid, &the_index,get_index_file (),0 ,NULL )) +if (write_index_as_tree (oid, the_repository->index,get_index_file (),0 ,NULL ))die (_ ("git write-tree failed to write a tree" )); }
@@ -745,7 +744,7 @@ static int try_merge_strategy(const char *strategy, struct commit_list *common,rollback_lock_file (&lock);return 2 ; } -if (write_locked_index (&the_index, &lock, +if (write_locked_index (the_repository->index, &lock,COMMIT_LOCK |SKIP_IF_UNCHANGED ))die (_ ("unable to write %s" ),get_index_file ());return clean ?0 :1 ;
@@ -768,8 +767,8 @@ static int count_unmerged_entries(void) {int i, ret =0 ; -for (i =0 ; i < the_index.cache_nr; i++) -if (ce_stage (the_index.cache[i])) +for (i =0 ; i < the_repository->index->cache_nr; i++) +if (ce_stage (the_repository->index->cache[i])) ret++;return ret;
@@ -843,9 +842,9 @@ static void prepare_to_commit(struct commit_list *remoteheads)* the editor and after we invoke run_status above. */ if (invoked_hook) -discard_index (&the_index); +discard_index (the_repository->index); } -read_index_from (&the_index, index_file,get_git_dir ()); +read_index_from (the_repository->index, index_file,get_git_dir ());strbuf_addbuf (&msg, &merge_msg);if (squash)BUG ("the control must not reach here under --squash" );
@@ -957,7 +956,7 @@ static int suggest_conflicts(void)* Thus, we will get the cleanup mode which is returned when we _are_ * using an editor. */ -append_conflicts_hint (&the_index, &msgbuf, +append_conflicts_hint (the_repository->index, &msgbuf,get_cleanup_mode (cleanup_arg,1 ));fputs (msgbuf.buf, fp);strbuf_release (&msgbuf);
@@ -1386,7 +1385,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)else die (_ ("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." )); } -resolve_undo_clear_index (&the_index); +resolve_undo_clear_index (the_repository->index);if (option_edit <0 ) option_edit =default_edit_option ();
@@ -1595,7 +1594,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)* We are not doing octopus, not fast-forward, and have * only one common. */ -refresh_index (&the_index,REFRESH_QUIET ,NULL ,NULL ,NULL ); +refresh_index (the_repository->index,REFRESH_QUIET ,NULL ,NULL ,NULL );if (allow_trivial && fast_forward !=FF_ONLY ) {/* * Must first ensure that index matches HEAD before
@@ -1784,6 +1783,6 @@ int cmd_merge(int argc, const char **argv, const char *prefix) }strbuf_release (&buf);free (branch_to_free); -discard_index (&the_index); +discard_index (the_repository->index);return ret; }
builtin/mv.c +34 -34
207 lines not on this page · raw message
builtin/pull.c +2 -2
@@ -5,7 +5,7 @@* * Fetch one or more remote refs and merge it/them into the current HEAD. */ -#define USE_THE_INDEX_VARIABLE +#include "builtin.h" #include "advice.h" #include "config.h"
@@ -1044,7 +1044,7 @@ int cmd_pull(int argc, const char **argv, const char *prefix)if (opt_autostash ==-1 ) opt_autostash = config_autostash; -if (is_null_oid (&orig_head) && !is_index_unborn (&the_index)) +if (is_null_oid (&orig_head) && !is_index_unborn (the_repository->index))die (_ ("Updating an unborn branch with changes added to the index." ));if (!opt_autostash)
builtin/read-tree.c +7 -8
@@ -4,7 +4,6 @@* Copyright (C) Linus Torvalds, 2005 */ -#define USE_THE_INDEX_VARIABLE #include "builtin.h" #include "config.h" #include "gettext.h"
@@ -159,8 +158,8 @@ int cmd_read_tree(int argc, const char **argv, const char *cmd_prefix)memset (&opts,0 ,sizeof (opts)); opts.head_idx =-1 ; - opts.src_index = &the_index; - opts.dst_index = &the_index; + opts.src_index = the_repository->index; + opts.dst_index = the_repository->index;git_config (git_read_tree_config,NULL );
@@ -197,7 +196,7 @@ int cmd_read_tree(int argc, const char **argv, const char *cmd_prefix)die (_ ("You need to resolve your current index first" )); stage = opts.merge =1 ; } -resolve_undo_clear_index (&the_index); +resolve_undo_clear_index (the_repository->index);for (i =0 ; i < argc; i++) {const char *arg = argv[i];
@@ -225,7 +224,7 @@ int cmd_read_tree(int argc, const char **argv, const char *cmd_prefix)setup_work_tree ();if (opts.skip_sparse_checkout) -ensure_full_index (&the_index); +ensure_full_index (the_repository->index);if (opts.merge) {switch (stage -1 ) {
@@ -237,7 +236,7 @@ int cmd_read_tree(int argc, const char **argv, const char *cmd_prefix)break ;case 2 : opts.fn = twoway_merge; - opts.initial_checkout =is_index_unborn (&the_index); + opts.initial_checkout =is_index_unborn (the_repository->index);break ;case 3 :default :
@@ -258,7 +257,7 @@ int cmd_read_tree(int argc, const char **argv, const char *cmd_prefix)if (nr_trees ==1 && !opts.prefix) opts.skip_cache_tree_update =1 ; -cache_tree_free (&the_index.cache_tree); +cache_tree_free (&the_repository->index->cache_tree);for (i =0 ; i < nr_trees; i++) {struct tree *tree = trees[i];if (parse_tree (tree) <0 )
@@ -282,7 +281,7 @@ int cmd_read_tree(int argc, const char **argv, const char *cmd_prefix) the_repository->index, trees[0]); -if (write_locked_index (&the_index, &lock_file,COMMIT_LOCK )) +if (write_locked_index (the_repository->index, &lock_file,COMMIT_LOCK ))die ("unable to write new index file" );return 0 ; }
builtin/rebase.c +1 -2
@@ -4,7 +4,6 @@* Copyright (c) 2018 Pratik Karki */ -#define USE_THE_INDEX_VARIABLE #include "builtin.h" #include "abspath.h" #include "environment.h"
@@ -295,7 +294,7 @@ static int do_interactive_rebase(struct rebase_options *opts, unsigned flags)if (ret)error (_ ("could not generate todo list" ));else { -discard_index (&the_index); +discard_index (the_repository->index);if (todo_list_parse_insn_buffer (the_repository, todo_list.buf.buf, &todo_list))BUG ("unusable todo list" );
builtin/replay.c +0 -1
@@ -2,7 +2,6 @@* "git replay" builtin command */ -#define USE_THE_INDEX_VARIABLE #include "git-compat-util.h" #include "builtin.h"
builtin/reset.c +16 -16
@@ -7,7 +7,7 @@* * Copyright (c) 2005, 2006 Linus Torvalds and Junio C Hamano */ -#define USE_THE_INDEX_VARIABLE +#include "builtin.h" #include "advice.h" #include "config.h"
@@ -66,8 +66,8 @@ static int reset_index(const char *ref, const struct object_id *oid, int reset_tmemset (&opts,0 ,sizeof (opts)); opts.head_idx =1 ; - opts.src_index = &the_index; - opts.dst_index = &the_index; + opts.src_index = the_repository->index; + opts.dst_index = the_repository->index; opts.fn = oneway_merge; opts.merge =1 ;init_checkout_metadata (&opts.meta, ref, oid,NULL );
@@ -159,11 +159,11 @@ static void update_index_from_diff(struct diff_queue_struct *q,struct cache_entry *ce;if (!is_in_reset_tree && !intent_to_add) { -remove_file_from_index (&the_index, one->path); +remove_file_from_index (the_repository->index, one->path);continue ; } - ce =make_cache_entry (&the_index, one->mode, &one->oid, one->path, + ce =make_cache_entry (the_repository->index, one->mode, &one->oid, one->path,0 ,0 );/*
@@ -174,9 +174,9 @@ static void update_index_from_diff(struct diff_queue_struct *q,* if this entry is outside the sparse cone - this is necessary * to properly construct the reset sparse directory. */ - pos =index_name_pos (&the_index, one->path,strlen (one->path)); -if ((pos >=0 &&ce_skip_worktree (the_index.cache[pos])) || - (pos <0 && !path_in_sparse_checkout (one->path, &the_index))) + pos =index_name_pos (the_repository->index, one->path,strlen (one->path)); +if ((pos >=0 &&ce_skip_worktree (the_repository->index->cache[pos])) || + (pos <0 && !path_in_sparse_checkout (one->path, the_repository->index))) ce->ce_flags |=CE_SKIP_WORKTREE ;if (!ce)
@@ -186,7 +186,7 @@ static void update_index_from_diff(struct diff_queue_struct *q, ce->ce_flags |=CE_INTENT_TO_ADD ;set_object_name_for_intent_to_add_entry (ce); } -add_index_entry (&the_index, ce, +add_index_entry (the_repository->index, ce,ADD_CACHE_OK_TO_ADD |ADD_CACHE_OK_TO_REPLACE ); } }
@@ -208,8 +208,8 @@ static int read_from_tree(const struct pathspec *pathspec, opt.change = diff_change; opt.add_remove = diff_addremove; -if (pathspec->nr &&pathspec_needs_expanded_index (&the_index, pathspec)) -ensure_full_index (&the_index); +if (pathspec->nr &&pathspec_needs_expanded_index (the_repository->index, pathspec)) +ensure_full_index (the_repository->index);if (do_diff_cache (tree_oid, &opt))return 1 ;
@@ -235,7 +235,7 @@ static void set_reflog_message(struct strbuf *sb, const char *action,static void die_if_unmerged_cache (int reset_type) { -if (is_merge () ||unmerged_index (&the_index)) +if (is_merge () ||unmerged_index (the_repository->index))die (_ ("Cannot do a %s reset in the middle of a merge." ),_ (reset_type_names[reset_type]));
@@ -470,12 +470,12 @@ int cmd_reset(int argc, const char **argv, const char *prefix) update_ref_status =1 ; goto cleanup; } - the_index.updated_skipworktree =1 ; + the_repository->index->updated_skipworktree =1 ;if (!no_refresh &&get_git_work_tree ()) {uint64_t t_begin, t_delta_in_ms; t_begin =getnanotime (); -refresh_index (&the_index, flags,NULL ,NULL , +refresh_index (the_repository->index, flags,NULL ,NULL ,_ ("Unstaged changes after reset:" )); t_delta_in_ms = (getnanotime () - t_begin) /1000000 ;if (!quiet &&advice_enabled (ADVICE_RESET_NO_REFRESH_WARNING ) && t_delta_in_ms >REFRESH_INDEX_DELAY_WARNING_IN_MS ) {
@@ -501,7 +501,7 @@ int cmd_reset(int argc, const char **argv, const char *prefix)free (ref); } -if (write_locked_index (&the_index, &lock,COMMIT_LOCK )) +if (write_locked_index (the_repository->index, &lock,COMMIT_LOCK ))die (_ ("Could not write new index file." )); }
@@ -516,7 +516,7 @@ int cmd_reset(int argc, const char **argv, const char *prefix)if (!pathspec.nr)remove_branch_state (the_repository,0 ); -discard_index (&the_index); +discard_index (the_repository->index); cleanup:clear_pathspec (&pathspec);
builtin/rev-parse.c +3 -3
@@ -3,7 +3,7 @@* * Copyright (C) Linus Torvalds, 2005 */ -#define USE_THE_INDEX_VARIABLE +#include "builtin.h" #include "abspath.h" #include "config.h"
@@ -1049,8 +1049,8 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)if (!strcmp (arg,"--shared-index-path" )) {if (repo_read_index (the_repository) <0 )die (_ ("Could not read the index" )); -if (the_index.split_index) { -const struct object_id *oid = &the_index.split_index->base_oid; +if (the_repository->index->split_index) { +const struct object_id *oid = &the_repository->index->split_index->base_oid;const char *path =git_path ("sharedindex.%s" ,oid_to_hex (oid));print_path (path, prefix, format,DEFAULT_RELATIVE ); }
builtin/rm.c +20 -20
@@ -3,7 +3,7 @@* * Copyright (C) Linus Torvalds 2006 */ -#define USE_THE_INDEX_VARIABLE +#include "builtin.h" #include "advice.h" #include "config.h"
@@ -41,8 +41,8 @@ static int get_ours_cache_pos(const char *path, int pos) {int i = -pos -1 ; -while ((i < the_index.cache_nr) && !strcmp (the_index.cache[i]->name, path)) { -if (ce_stage (the_index.cache[i]) ==2 ) +while ((i < the_repository->index->cache_nr) && !strcmp (the_repository->index->cache[i]->name, path)) { +if (ce_stage (the_repository->index->cache[i]) ==2 )return i; i++; }
@@ -78,13 +78,13 @@ static void submodules_absorb_gitdir_if_needed(void)int pos;const struct cache_entry *ce; - pos =index_name_pos (&the_index, name,strlen (name)); + pos =index_name_pos (the_repository->index, name,strlen (name));if (pos <0 ) { pos =get_ours_cache_pos (name, pos);if (pos <0 )continue ; } - ce = the_index.cache[pos]; + ce = the_repository->index->cache[pos]; if (!S_ISGITLINK(ce->ce_mode) || !file_exists(ce->name) ||
@@ -122,7 +122,7 @@ static int check_local_mod(struct object_id *head, int index_only)int local_changes =0 ;int staged_changes =0 ; - pos =index_name_pos (&the_index, name,strlen (name)); + pos =index_name_pos (the_repository->index, name,strlen (name));if (pos <0 ) {/* * Skip unmerged entries except for populated submodules
@@ -132,11 +132,11 @@ static int check_local_mod(struct object_id *head, int index_only)if (pos <0 )continue ; -if (!S_ISGITLINK (the_index.cache[pos]->ce_mode) || +if (!S_ISGITLINK (the_repository->index->cache[pos]->ce_mode) ||is_empty_dir (name))continue ; } - ce = the_index.cache[pos]; + ce = the_repository->index->cache[pos];if (lstat (ce->name, &st) <0 ) {if (!is_missing_file_error (errno))
@@ -173,7 +173,7 @@ static int check_local_mod(struct object_id *head, int index_only)* Is the index different from the file in the work tree? * If it's a submodule, is its work tree modified? */ - if (ie_match_stat(&the_index, ce, &st, 0) || + if (ie_match_stat(the_repository->index, ce, &st, 0) || (S_ISGITLINK(ce->ce_mode) && bad_to_remove_submodule(ce->name, SUBMODULE_REMOVAL_DIE_ON_ERROR |
@@ -301,27 +301,27 @@ int cmd_rm(int argc, const char **argv, const char *prefix)if (repo_read_index (the_repository) <0 )die (_ ("index file corrupt" )); -refresh_index (&the_index,REFRESH_QUIET |REFRESH_UNMERGED , &pathspec,NULL ,NULL ); +refresh_index (the_repository->index,REFRESH_QUIET |REFRESH_UNMERGED , &pathspec,NULL ,NULL ); seen =xcalloc (pathspec.nr,1 ); -if (pathspec_needs_expanded_index (&the_index, &pathspec)) -ensure_full_index (&the_index); +if (pathspec_needs_expanded_index (the_repository->index, &pathspec)) +ensure_full_index (the_repository->index); -for (i =0 ; i < the_index.cache_nr; i++) { -const struct cache_entry *ce = the_index.cache[i]; +for (i =0 ; i < the_repository->index->cache_nr; i++) { +const struct cache_entry *ce = the_repository->index->cache[i];if (!include_sparse && (ce_skip_worktree (ce) || - !path_in_sparse_checkout (ce->name, &the_index))) + !path_in_sparse_checkout (ce->name, the_repository->index)))continue ; -if (!ce_path_match (&the_index, ce, &pathspec, seen)) +if (!ce_path_match (the_repository->index, ce, &pathspec, seen))continue ;ALLOC_GROW (list.entry, list.nr +1 , list.alloc); list.entry[list.nr].name =xstrdup (ce->name); list.entry[list.nr].is_submodule =S_ISGITLINK (ce->ce_mode);if (list.entry[list.nr++].is_submodule && - !is_staging_gitmodules_ok (&the_index)) + !is_staging_gitmodules_ok (the_repository->index))die (_ ("please stage your changes to .gitmodules or stash them to proceed" )); }
@@ -391,7 +391,7 @@ int cmd_rm(int argc, const char **argv, const char *prefix)if (!quiet)printf ("rm '%s'\n" , path); -if (remove_file_from_index (&the_index, path)) +if (remove_file_from_index (the_repository->index, path))die (_ ("git rm: unable to remove %s" ), path); }
@@ -432,10 +432,10 @@ int cmd_rm(int argc, const char **argv, const char *prefix) }strbuf_release (&buf);if (gitmodules_modified) -stage_updated_gitmodules (&the_index); +stage_updated_gitmodules (the_repository->index); } -if (write_locked_index (&the_index, &lock_file, +if (write_locked_index (the_repository->index, &lock_file,COMMIT_LOCK |SKIP_IF_UNCHANGED ))die (_ ("Unable to write new index file" ));
builtin/stash.c +22 -23
143 lines not on this page · raw message
builtin/submodule--helper.c +10 -11
@@ -1,4 +1,3 @@ -#define USE_THE_INDEX_VARIABLE #include "builtin.h" #include "abspath.h" #include "environment.h"
@@ -207,18 +206,18 @@ static int module_list_compute(const char **argv,if (repo_read_index (the_repository) <0 )die (_ ("index file corrupt" )); -for (i =0 ; i < the_index.cache_nr; i++) { -const struct cache_entry *ce = the_index.cache[i]; +for (i =0 ; i < the_repository->index->cache_nr; i++) { +const struct cache_entry *ce = the_repository->index->cache[i]; -if (!match_pathspec (&the_index, pathspec, ce->name,ce_namelen (ce), +if (!match_pathspec (the_repository->index, pathspec, ce->name,ce_namelen (ce),0 , ps_matched,1 ) || !S_ISGITLINK (ce->ce_mode))continue ;ALLOC_GROW (list->entries, list->nr +1 , list->alloc); list->entries[list->nr++] = ce; -while (i +1 < the_index.cache_nr && - !strcmp (ce->name, the_index.cache[i +1 ]->name)) +while (i +1 < the_repository->index->cache_nr && + !strcmp (ce->name, the_repository->index->cache[i +1 ]->name))/* * Skip entries with the same name in different stages * to make sure an entry is returned only once.
@@ -907,7 +906,7 @@ static void generate_submodule_summary(struct summary_cb *info,int fd =open (p->sm_path,O_RDONLY );if (fd <0 ||fstat (fd, &st) <0 || -index_fd (&the_index, &p->oid_dst, fd, &st,OBJ_BLOB , +index_fd (the_repository->index, &p->oid_dst, fd, &st,OBJ_BLOB , p->sm_path,0 ))error (_ ("couldn't hash object from '%s'" ), p->sm_path); }else {
@@ -3243,21 +3242,21 @@ static void die_on_index_match(const char *path, int force)char *ps_matched =xcalloc (ps.nr,1 );/* TODO: audit for interaction with sparse-index. */ -ensure_full_index (&the_index); +ensure_full_index (the_repository->index);/* * Since there is only one pathspec, we just need to * check ps_matched[0] to know if a cache entry matched. */ -for (i =0 ; i < the_index.cache_nr; i++) { -ce_path_match (&the_index, the_index.cache[i], &ps, +for (i =0 ; i < the_repository->index->cache_nr; i++) { +ce_path_match (the_repository->index, the_repository->index->cache[i], &ps, ps_matched);if (ps_matched[0 ]) {if (!force)die (_ ("'%s' already exists in the index" ), path); -if (!S_ISGITLINK (the_index.cache[i]->ce_mode)) +if (!S_ISGITLINK (the_repository->index->cache[i]->ce_mode))die (_ ("'%s' already exists in the index " "and is not a submodule" ), path);break ;
builtin/update-index.c +61 -61
360 lines not on this page · raw message
builtin/write-tree.c +3 -3
@@ -3,7 +3,7 @@* * Copyright (C) Linus Torvalds, 2005 */ -#define USE_THE_INDEX_VARIABLE +#include "builtin.h" #include "config.h" #include "environment.h"
@@ -44,8 +44,8 @@ int cmd_write_tree(int argc, const char **argv, const char *cmd_prefix)prepare_repo_settings (the_repository); the_repository->settings.command_requires_full_index =0 ; - ret =write_index_as_tree (&oid, &the_index,get_index_file (), flags, - tree_prefix); + ret =write_index_as_tree (&oid, the_repository->index,get_index_file (), + flags, tree_prefix);switch (ret) {case 0 :printf ("%s\n" ,oid_to_hex (&oid));
Signature · 1 line
2.44.GIT
Re: [PATCH 2/5] builtin: stop using `the_index`
[snip]
builtin/cat-file.c line 6
Quoted 9 lines
builtin/cat-file.c +0
-1@@ -3,7 +3,6 @@* * Copyright (C) Linus Torvalds, 2005 */ -#define USE_THE_INDEX_VARIABLE
Nit: The other changes have a newline after the header.
Re: [PATCH 2/5] builtin: stop using `the_index`
Quoted 13 lines · Karthik Nayak
[snip]
builtin/cat-file.c line 6
Quoted 9 lines
builtin/cat-file.c +0
-1@@ -3,7 +3,6 @@* * Copyright (C) Linus Torvalds, 2005 */ -#define USE_THE_INDEX_VARIABLE Nit: The other changes have a newline after the header.
Good catch.
Patrick
PATCH 3/5 repository: initialize index in `repo_init()`
In reply to Patrick SteinhardtWhen Git starts, one of the first things it will do is to call initialize_the_repository(). This function sets up both the global the_repository and the_index variables as required. Part of that setup is also to set the_repository.index = &the_index so that the index can be accessed via the repository.
When calling repo_init() on a repository though we set the complete struct to all-zeroes, which will also cause us to unset the index pointer. And as we don't re-initialize the index in that function, we will end up with a NULL pointer here.
This has been fine until now becaues this function is only used to create a new repository. git-init(1) does not access the index at all after initializing the repository, whereas git-checkout(1) only uses the_index directly. We are about to remove the_index though, which will uncover this partially-initialized repository structure.
Refactor the code and create a common initialize_repository() function that gets called from repo_init() and initialize_the_repository(). This function sets up both the repository and the index as required. Like this, we can easily special-case when repo_init() gets called with the_repository.
--- repository.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-)
repository.c +17 -11
@@ -25,17 +25,20 @@ static struct repository the_repo;struct repository *the_repository;struct index_state the_index; +static void initialize_repository (struct repository *repo, +struct index_state *index) +{ + repo->index = index; + repo->objects =raw_object_store_new (); + repo->remote_state =remote_state_new (); + repo->parsed_objects =parsed_object_pool_new (); +index_state_init (index, repo); +} +void initialize_the_repository (void ) { the_repository = &the_repo; - - the_repo.index = &the_index; - the_repo.objects =raw_object_store_new (); - the_repo.remote_state =remote_state_new (); - the_repo.parsed_objects =parsed_object_pool_new (); - -index_state_init (&the_index, the_repository); - +initialize_repository (the_repository, &the_index);repo_set_hash_algo (&the_repo,GIT_HASH_SHA1 ); }
@@ -188,9 +191,12 @@ int repo_init(struct repository *repo,struct repository_format format =REPOSITORY_FORMAT_INIT ;memset (repo,0 ,sizeof (*repo)); - repo->objects =raw_object_store_new (); - repo->parsed_objects =parsed_object_pool_new (); - repo->remote_state =remote_state_new (); +if (repo == the_repository) { +initialize_repository (the_repository, &the_index); + }else { +ALLOC_ARRAY (repo->index,1 ); +initialize_repository (repo, repo->index); + }if (repo_init_gitdir (repo, gitdir)) goto error;
Signature · 1 line
2.44.GIT
Re: [PATCH 3/5] repository: initialize index in `repo_init()`
Quoted 6 lines · Patrick Steinhardt
Refactor the code and create a common
initialize_repository()function that gets called fromrepo_init()andinitialize_the_repository(). This function sets up both the repository and the index as required. Like this, we can easily special-case whenrepo_init()gets called withthe_repository.
Nit: initialize_the_repository() calling initialize_repository() doesn't really indicate what each of them does and why we have two functions which are similarly named but calling each other. Maybe we should rename them?
Re: [PATCH 3/5] repository: initialize index in `repo_init()`
Quoted 9 lines · Karthik Nayak
Quoted 6 lines · Patrick Steinhardt
Refactor the code and create a common
initialize_repository()function that gets called fromrepo_init()andinitialize_the_repository(). This function sets up both the repository and the index as required. Like this, we can easily special-case whenrepo_init()gets called withthe_repository.
Quoted 4 lines
Nit:
initialize_the_repository()callinginitialize_repository()doesn't really indicate what each of them does and why we have two functions which are similarly named but calling each other. Maybe we should rename them?
I think once you know about the_repository it isn't all that bad. Whereas initialize_repository() initializes any repository, initialize_the_repository() only initializes the_repository.
But you know, let's further simplify this and move all initialization logic into initialize_repository() to make this hopefully clearer. And on top of that we can then also drop initialize_the_repository() completely by statically initializing the the_repository pointer so that callers can simply call initialize_repository(&the_repository) instead.
Patrick
PATCH 4/5 builtin/clone: stop using `the_index`
In reply to Patrick SteinhardtConvert git-clone(1) to use the_repository->index instead of the_index.
--- builtin/clone.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
builtin/clone.c +3 -4
@@ -8,7 +8,6 @@* Clone a repository into a different directory that does not yet exist. */ -#define USE_THE_INDEX_VARIABLE #include "builtin.h" #include "abspath.h" #include "advice.h"
@@ -731,8 +730,8 @@ static int checkout(int submodule_progress, int filter_submodules) opts.preserve_ignored =0 ; opts.fn = oneway_merge; opts.verbose_update = (option_verbosity >=0 ); - opts.src_index = &the_index; - opts.dst_index = &the_index; + opts.src_index = the_repository->index; + opts.dst_index = the_repository->index;init_checkout_metadata (&opts.meta, head, &oid,NULL ); tree =parse_tree_indirect (&oid);
@@ -746,7 +745,7 @@ static int checkout(int submodule_progress, int filter_submodules)free (head); -if (write_locked_index (&the_index, &lock_file,COMMIT_LOCK )) +if (write_locked_index (the_repository->index, &lock_file,COMMIT_LOCK ))die (_ ("unable to write new index file" )); err |= run_hooks_l("post-checkout", oid_to_hex(null_oid()),
Signature · 1 line
2.44.GIT
PATCH 5/5 repository: drop global `the_index` variable
In reply to Patrick SteinhardtAll users of the_index have been converted to use either a custom struct index_state * or the index provided by the_repository. We can thus drop the globally-accessible declaration of this variable.
This concludes the quest to make Git the_index free, which has started with 4aab5b46f4 (Make read-cache.c "the_index" free., 2007-04-01).
--- repository.c | 4 ++-- repository.h | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-)
repository.c +2 -2
@@ -2,7 +2,7 @@* not really _using_ the compat macros, just make sure the_index * declaration matches the definition in this file. */ -#define USE_THE_INDEX_VARIABLE +#include "git-compat-util.h" #include "abspath.h" #include "repository.h"
@@ -23,7 +23,7 @@/* The main repository */ static struct repository the_repo;struct repository *the_repository; -struct index_state the_index; +static struct index_state the_index;static void initialize_repository (struct repository *repo,struct index_state *index)
repository.h +0 -3
@@ -187,9 +187,6 @@ struct repository { };extern struct repository *the_repository; -#ifdef USE_THE_INDEX_VARIABLE -extern struct index_state the_index; -#endif /* * Define a custom repository layout. Any field can be NULL, which
Signature · 1 line
2.44.GIT
Hi Patrick
Quoted 6 lines · Patrick Steinhardt
The motivation of these patches comes from the introduction of the ref format extension. I found it really hard to reason about the state of
the_repositoryand would like to continue its deprecation in favor of explicitly passing down astruct repository *. Getting rid ofthe_indexis a first easy step into that direction to make things more self-contained.
Maybe I've got the wrong end of the stick but my impression is that it is the use of "the_repository" in library code (i.e. the files outside builtin/) that causes most of the pain. With that in mind would be we better focusing contributor and reviewer effort on eliminating "the_repository" from those files instead? It would need to be done in carefully in stages but would bring real benefits.
Best Wishes
Phillip
Quoted 50 lines
Patrick
Patrick Steinhardt (5):
t/helper: stop usingthe_index
builtin: stop usingthe_index
repository: initialize index inrepo_init()
builtin/clone: stop usingthe_index
repository: drop globalthe_indexvariablebuiltin/add.c | 48 +++++------ builtin/am.c | 36 ++++---- builtin/cat-file.c | 3 +- builtin/check-attr.c | 5 +- builtin/check-ignore.c | 7 +- builtin/checkout-index.c | 22 ++--- builtin/checkout.c | 87 ++++++++++--------- builtin/clean.c | 7 +- builtin/clone.c | 7 +- builtin/commit.c | 81 +++++++++--------- builtin/describe.c | 3 +- builtin/diff-tree.c | 3 +- builtin/diff.c | 6 +- builtin/difftool.c | 4 +- builtin/merge-index.c | 17 ++-- builtin/merge-tree.c | 3 +- builtin/merge.c | 31 ++++--- builtin/mv.c | 68 +++++++-------- builtin/pull.c | 4 +- builtin/read-tree.c | 15 ++-- builtin/rebase.c | 3 +- builtin/replay.c | 1 - builtin/reset.c | 32 +++---- builtin/rev-parse.c | 6 +- builtin/rm.c | 40 ++++----- builtin/stash.c | 45 +++++----- builtin/submodule--helper.c | 21 +++-- builtin/update-index.c | 122 +++++++++++++-------------- builtin/write-tree.c | 6 +- repository.c | 32 ++++--- repository.h | 3 - t/helper/test-cache-tree.c | 17 ++-- t/helper/test-dump-cache-tree.c | 5 +- t/helper/test-dump-split-index.c | 11 ++- t/helper/test-dump-untracked-cache.c | 3 +- t/helper/test-lazy-init-name-hash.c | 39 +++++---- t/helper/test-read-cache.c | 9 +- t/helper/test-scrap-cache-tree.c | 7 +- t/helper/test-write-cache.c | 3 +- 39 files changed, 420 insertions(+), 442 deletions(-)
Quoted 10 lines · Phillip Wood
Hi Patrick
Quoted 6 lines · Patrick Steinhardt
The motivation of these patches comes from the introduction of the ref format extension. I found it really hard to reason about the state of
the_repositoryand would like to continue its deprecation in favor of explicitly passing down astruct repository *. Getting rid ofthe_indexis a first easy step into that direction to make things more self-contained.
Quoted 6 lines
Maybe I've got the wrong end of the stick but my impression is that it is the use of "
the_repository" in library code (i.e. the files outside builtin/) that causes most of the pain. With that in mind would be we better focusing contributor and reviewer effort on eliminating "the_repository" from those files instead? It would need to be done in carefully in stages but would bring real benefits.
I see these two things as orthogonal. Overall, the target is to have as few global state as possible. This requires us to over time remove both the_repository, but also the_index. Removing the latter is a ton easier to achieve than removing the former, and so I took the easier step first.
Whatever we do, we have to do things gradually anyway and thus we have to start somewhere. I've already got more things in the pipeline, where the next step for me is to touch up "refs.h" so that we always pass in the struct ref_store *. And here we will be introducing more uses of the_repository, as well. But I think this is okay, and by working from the bottom up we will over time get to a state where the lower levels of Git don't require globals anymore, whereas higher levels like e.g. the builtins still do use them.
Eventually, we can then introduce a macro USE_THE_REPOSITORY_VARIABLE, similar to USE_THE_INDEX_VARIABLE that I have just removed in this patch series.
Patrick
Quoted 6 lines · Phillip Wood
Maybe I've got the wrong end of the stick but my impression is that it is the use of "
the_repository" in library code (i.e. the files outside builtin/) that causes most of the pain. With that in mind would be we better focusing contributor and reviewer effort on eliminating "the_repository" from those files instead? It would need to be done in carefully in stages but would bring real benefits.
I am afraid that it would take a much larger effort.
I have a suspicion that many of the users of the_index do not have to even need that the index_state they work on is connected to any instance of a repository object (in other words, I tend to think that the value of having a pointer to an index_state in an instance of a repository structure is dubious), so in a sense, this rewrite of code that use the_index to use the_repository may be going in a wrong direction. In other words, these functions may eventually want to take a pointer to an index_state structure as their parameters, without having to deal with the whole repository structure, but this rewrite assumes they would eventually want to all work with a repository structure when the_repository dependency is lifted. I'll need to see the codepaths involved more carefully and think about it.
Thanks.
Quoted 11 lines · Junio C Hamano
Quoted 6 lines · Phillip Wood
Maybe I've got the wrong end of the stick but my impression is that it is the use of "
the_repository" in library code (i.e. the files outside builtin/) that causes most of the pain. With that in mind would be we better focusing contributor and reviewer effort on eliminating "the_repository" from those files instead? It would need to be done in carefully in stages but would bring real benefits.I am afraid that it would take a much larger effort.
Quoted 7 lines
I have a suspicion that many of the users of
the_indexdo not have to even need that theindex_statethey work on is connected to any instance of a repository object (in other words, I tend to think that the value of having a pointer to anindex_statein an instance of a repository structure is dubious), so in a sense, this rewrite of code that usethe_indexto usethe_repositorymay be going in a wrong direction.
I wouldn't say it's going in a wrong direction. It simply makes explicit what already is implicit and thus simplifies our ability to reason about the code.
At least it does that for me -- if others disagree then I will rethink my approach. But the third patch demonstrates that the current approach also causes weird inconsistencies in how we track the state of both the_index and the_repository in tandem.
Quoted 6 lines
In other words, these functions may eventually want to take a pointer to an
index_statestructure as their parameters, without having to deal with the whole repository structure, but this rewrite assumes they would eventually want to all work with a repository structure whenthe_repositorydependency is lifted. I'll need to see the codepaths involved more carefully and think about it.
Yes, that's something that we will have to do eventually. I simply think that the easiest way to approach this is bottom-up by moving the level at which we inject the index one level up at a time. And with every level that we move up we should figure out the intent of the code so that we can decide whether it should use a local copy, the index of the repository or something else.
Patrick
Hello,
Quoted 7 lines · Patrick Steinhardt
Hi,
this patch series converts remaining users of
the_indexto stop using it, instead usingthe_repository->index. This gets rid of one more global variable and brings a project over the finish line that has started back in 2007.
Quoted 5 lines
I realize that this patch series is quite large, and that reviewers will eventually start to just gloss over things because the conversions are kind of boring, too. Also, due to the size it's quite likely to conflict with in-flight topics. So if you think that this is too large, please let me know and I will happily split this up into multiple series.
I gave it a glance review. I also wanted to run the tests on each commit, but couldn't apply the series cleanly on either master or next.
Quoted 11 lines · Karthik Nayak
Hello,
Quoted 7 lines · Patrick Steinhardt
Hi,
this patch series converts remaining users of
the_indexto stop using it, instead usingthe_repository->index. This gets rid of one more global variable and brings a project over the finish line that has started back in 2007.
Quoted 8 lines
Quoted 5 lines
I realize that this patch series is quite large, and that reviewers will eventually start to just gloss over things because the conversions are kind of boring, too. Also, due to the size it's quite likely to conflict with in-flight topics. So if you think that this is too large, please let me know and I will happily split this up into multiple series.
I gave it a glance review. I also wanted to run the tests on each commit, but couldn't apply the series cleanly on either master or next.
Huh, weird. It applies cleanly on top of both 21306a098c (The twentieth batch, 2024-04-16) and 701ccded8b (Merge branch 'rs/apply-reject-long-name' into next, 2024-04-17) for me.
Patrick
v2 cover global: drop `the_index` variable
In reply to Patrick SteinhardtHi,
this is the second version of my patch series that aims to drop the_index.
Changes compared to v1:
- This version goes a bit further now and completely drops the static the_index variable, as well. The repository's index gets allocated dynamically now, like all the other sub-structures like the ODB.
- This also allows this series to remove initialize_the_repository() now. Instead, callers call initialize_repository() now.
There is still quite an ugly hack in initialize_repository() which requires us to treat the_repository specially. This is because the_hash_algo maps to the_repository->hash_algo, and we rely on it being initialized to SHA1. So we need call repo_set_hash_algo() on the_repository. On the other hand, we cannot set the hash algo on repos which are not the_repository, because that breaks stuff, as well.
I'm currently prepping another patch series that builds on top of this series and cleans up this mess. It surfaces several bugs that got masked by our setup, like for example git rev-parse --short= not working correctly with SHA256 because we always truncate to the maximum length of SHA1.
Patrick
Patrick Steinhardt (6):
t/helper: stop using the_index
builtin: stop using the_index
repository: initialize index in repo_init()
builtin/clone: stop using the_index
repository: drop the_index variable
repository: drop initialize_the_repository()
builtin/add.c | 48 +++++------ builtin/am.c | 36 ++++---- builtin/cat-file.c | 4 +- builtin/check-attr.c | 5 +- builtin/check-ignore.c | 7 +- builtin/checkout-index.c | 22 ++--- builtin/checkout.c | 87 ++++++++++--------- builtin/clean.c | 7 +- builtin/clone.c | 7 +- builtin/commit.c | 81 +++++++++--------- builtin/describe.c | 3 +- builtin/diff-tree.c | 3 +- builtin/diff.c | 6 +- builtin/difftool.c | 4 +- builtin/merge-index.c | 17 ++-- builtin/merge-tree.c | 3 +- builtin/merge.c | 31 ++++--- builtin/mv.c | 68 +++++++-------- builtin/pull.c | 4 +- builtin/read-tree.c | 15 ++-- builtin/rebase.c | 3 +- builtin/replay.c | 1 - builtin/reset.c | 32 +++---- builtin/rev-parse.c | 6 +- builtin/rm.c | 40 ++++----- builtin/stash.c | 45 +++++----- builtin/submodule--helper.c | 21 +++-- builtin/update-index.c | 122 +++++++++++++-------------- builtin/write-tree.c | 6 +- common-main.c | 2 +- oss-fuzz/fuzz-commit-graph.c | 3 +- repository.c | 50 ++++++----- repository.h | 5 +- t/helper/test-cache-tree.c | 17 ++-- t/helper/test-dump-cache-tree.c | 5 +- t/helper/test-dump-split-index.c | 11 ++- t/helper/test-dump-untracked-cache.c | 3 +- t/helper/test-lazy-init-name-hash.c | 39 +++++---- t/helper/test-read-cache.c | 11 ++- t/helper/test-scrap-cache-tree.c | 7 +- t/helper/test-write-cache.c | 3 +- 41 files changed, 435 insertions(+), 455 deletions(-)
Range-diff against v1:
1: 7b5ec04efc = 1: 1baacc1fd8 t/helper: stop using `the_index`
2: 9d5f2eff8a ! 2: 371f69a2c9 builtin: stop using `the_index`
@@ builtin/cat-file.c
* Copyright (C) Linus Torvalds, 2005
*/
-#define USE_THE_INDEX_VARIABLE
++
#include "builtin.h"
#include "config.h"
#include "convert.h"
@@ builtin/commit.c: static const char *prepare_index(const char **argv, const char
} else
warning(_("Failed to update main cache tree"));
@@ builtin/commit.c: static const char *prepare_index(const char **argv, const char *prefix,
- add_files_to_cache(the_repository, also ? prefix : NULL,
- &pathspec, 0, 0);
+ exit(128);
+
refresh_cache_or_die(refresh_flags);
- cache_tree_update(&the_index, WRITE_TREE_SILENT);
- if (write_locked_index(&the_index, &index_lock, 0))
3: 96256f9eb3 = 3: 416612e7e3 repository: initialize index in `repo_init()`
4: 881b6d2f7d = 4: 6fb1492018 builtin/clone: stop using `the_index`
5: 80c36225bc < -: ---------- repository: drop global `the_index` variable
-: ---------- > 5: 549f8c048f repository: drop `the_index` variable
-: ---------- > 6: ed722b9b4b repository: drop `initialize_the_repository()`Signature · 1 line
2.44.GIT
PATCH v2 1/6 t/helper: stop using `the_index`
Convert test-helper tools to use the_repository->index instead of the_index.
--- t/helper/test-cache-tree.c | 17 ++++++------ t/helper/test-dump-cache-tree.c | 5 ++-- t/helper/test-dump-split-index.c | 11 ++++---- t/helper/test-dump-untracked-cache.c | 3 +-- t/helper/test-lazy-init-name-hash.c | 39 ++++++++++++++-------------- t/helper/test-read-cache.c | 9 +++---- t/helper/test-scrap-cache-tree.c | 7 +++-- t/helper/test-write-cache.c | 3 +-- 8 files changed, 43 insertions(+), 51 deletions(-)
t/helper/test-cache-tree.c +8 -9
@@ -1,4 +1,3 @@ -#define USE_THE_INDEX_VARIABLE #include "test-tool.h" #include "gettext.h" #include "hex.h"
@@ -38,29 +37,29 @@ int cmd__cache_tree(int argc, const char **argv)if (repo_read_index (the_repository) <0 )die (_ ("unable to read index file" )); -oidcpy (&oid, &the_index.cache_tree->oid); +oidcpy (&oid, &the_repository->index->cache_tree->oid); tree =parse_tree_indirect (&oid);if (!tree)die (_ ("not a tree object: %s" ),oid_to_hex (&oid));if (empty) {/* clear the cache tree & allocate a new one */ -cache_tree_free (&the_index.cache_tree); - the_index.cache_tree =cache_tree (); +cache_tree_free (&the_repository->index->cache_tree); + the_repository->index->cache_tree =cache_tree (); }else if (invalidate_qty) {/* invalidate the specified number of unique paths */ -float f_interval = (float )the_index.cache_nr / invalidate_qty; +float f_interval = (float )the_repository->index->cache_nr / invalidate_qty;int interval = f_interval <1.0 ?1 : (int )f_interval; -for (i =0 ; i < invalidate_qty && i * interval < the_index.cache_nr; i++) -cache_tree_invalidate_path (&the_index, the_index.cache[i * interval]->name); +for (i =0 ; i < invalidate_qty && i * interval < the_repository->index->cache_nr; i++) +cache_tree_invalidate_path (the_repository->index, the_repository->index->cache[i * interval]->name); }if (argc !=1 )usage_with_options (test_cache_tree_usage, options);else if (!strcmp (argv[0 ],"prime" )) -prime_cache_tree (the_repository, &the_index, tree); +prime_cache_tree (the_repository, the_repository->index, tree);else if (!strcmp (argv[0 ],"update" )) -cache_tree_update (&the_index,WRITE_TREE_SILENT |WRITE_TREE_REPAIR ); +cache_tree_update (the_repository->index,WRITE_TREE_SILENT |WRITE_TREE_REPAIR );/* use "control" subcommand to specify no-op */ else if (!!strcmp (argv[0 ],"control" ))die (_ ("Unhandled subcommand '%s'" ), argv[0 ]);
t/helper/test-dump-cache-tree.c +2 -3
@@ -1,4 +1,3 @@ -#define USE_THE_INDEX_VARIABLE #include "test-tool.h" #include "hash.h" #include "hex.h"
@@ -68,10 +67,10 @@ int cmd__dump_cache_tree(int ac UNUSED, const char **av UNUSED)setup_git_directory ();if (repo_read_index (the_repository) <0 )die ("unable to read index file" ); - istate = the_index; + istate = *the_repository->index; istate.cache_tree = another;cache_tree_update (&istate,WRITE_TREE_DRY_RUN ); - ret =dump_cache_tree (the_index.cache_tree, another,"" ); + ret =dump_cache_tree (the_repository->index->cache_tree, another,"" );cache_tree_free (&another);return ret;
t/helper/test-dump-split-index.c +5 -6
@@ -1,4 +1,3 @@ -#define USE_THE_INDEX_VARIABLE #include "test-tool.h" #include "hex.h" #include "read-cache-ll.h"
@@ -19,16 +18,16 @@ int cmd__dump_split_index(int ac UNUSED, const char **av)setup_git_directory (); -do_read_index (&the_index, av[1 ],1 ); -printf ("own %s\n" ,oid_to_hex (&the_index.oid)); - si = the_index.split_index; +do_read_index (the_repository->index, av[1 ],1 ); +printf ("own %s\n" ,oid_to_hex (&the_repository->index->oid)); + si = the_repository->index->split_index;if (!si) {printf ("not a split index\n" );return 0 ; }printf ("base %s\n" ,oid_to_hex (&si->base_oid)); -for (i =0 ; i < the_index.cache_nr; i++) { -struct cache_entry *ce = the_index.cache[i]; +for (i =0 ; i < the_repository->index->cache_nr; i++) { +struct cache_entry *ce = the_repository->index->cache[i];printf ("%06o %s %d\t%s\n" , ce->ce_mode,oid_to_hex (&ce->oid),ce_stage (ce), ce->name); }
t/helper/test-dump-untracked-cache.c +1 -2
@@ -1,4 +1,3 @@ -#define USE_THE_INDEX_VARIABLE #include "test-tool.h" #include "dir.h" #include "hex.h"
@@ -56,7 +55,7 @@ int cmd__dump_untracked_cache(int ac UNUSED, const char **av UNUSED)setup_git_directory ();if (repo_read_index (the_repository) <0 )die ("unable to read index file" ); - uc = the_index.untracked; + uc = the_repository->index->untracked;if (!uc) {printf ("no untracked cache\n" );return 0 ;
t/helper/test-lazy-init-name-hash.c +19 -20
@@ -1,4 +1,3 @@ -#define USE_THE_INDEX_VARIABLE #include "test-tool.h" #include "environment.h" #include "name-hash.h"
@@ -40,22 +39,22 @@ static void dump_run(void)repo_read_index (the_repository);if (single) { -test_lazy_init_name_hash (&the_index,0 ); +test_lazy_init_name_hash (the_repository->index,0 ); }else { -int nr_threads_used =test_lazy_init_name_hash (&the_index,1 ); +int nr_threads_used =test_lazy_init_name_hash (the_repository->index,1 );if (!nr_threads_used)die ("non-threaded code path used" ); } -hashmap_for_each_entry (&the_index.dir_hash, &iter_dir, dir, +hashmap_for_each_entry (&the_repository->index->dir_hash, &iter_dir, dir, ent/* member name */ )printf ("dir %08x %7d %s\n" , dir->ent.hash, dir->nr, dir->name); -hashmap_for_each_entry (&the_index.name_hash, &iter_cache, ce, +hashmap_for_each_entry (&the_repository->index->name_hash, &iter_cache, ce, ent/* member name */ )printf ("name %08x %s\n" , ce->ent.hash, ce->name); -discard_index (&the_index); +discard_index (the_repository->index); }/*
@@ -74,7 +73,7 @@ static uint64_t time_runs(int try_threaded) t0 =getnanotime ();repo_read_index (the_repository); t1 =getnanotime (); - nr_threads_used =test_lazy_init_name_hash (&the_index, try_threaded); + nr_threads_used =test_lazy_init_name_hash (the_repository->index, try_threaded); t2 =getnanotime (); sum += (t2 - t1);
@@ -86,16 +85,16 @@ static uint64_t time_runs(int try_threaded)printf ("%f %f %d multi %d\n" , ((double )(t1 - t0))/1000000000 , ((double )(t2 - t1))/1000000000 , - the_index.cache_nr, + the_repository->index->cache_nr, nr_threads_used); else printf("%f %f %d single\n", ((double )(t1 - t0))/1000000000 , ((double )(t2 - t1))/1000000000 , - the_index.cache_nr); + the_repository->index->cache_nr);fflush (stdout); -discard_index (&the_index); +discard_index (the_repository->index); } avg = sum / count;
@@ -120,8 +119,8 @@ static void analyze_run(void)int nr;repo_read_index (the_repository); - cache_nr_limit = the_index.cache_nr; -discard_index (&the_index); + cache_nr_limit = the_repository->index->cache_nr; +discard_index (the_repository->index); nr = analyze;while (1 ) {
@@ -135,22 +134,22 @@ static void analyze_run(void)for (i =0 ; i < count; i++) {repo_read_index (the_repository); - the_index.cache_nr = nr;/* cheap truncate of index */ + the_repository->index->cache_nr = nr;/* cheap truncate of index */ t1s =getnanotime (); -test_lazy_init_name_hash (&the_index,0 ); +test_lazy_init_name_hash (the_repository->index,0 ); t2s =getnanotime (); sum_single += (t2s - t1s); - the_index.cache_nr = cache_nr_limit; -discard_index (&the_index); + the_repository->index->cache_nr = cache_nr_limit; +discard_index (the_repository->index);repo_read_index (the_repository); - the_index.cache_nr = nr;/* cheap truncate of index */ + the_repository->index->cache_nr = nr;/* cheap truncate of index */ t1m =getnanotime (); - nr_threads_used =test_lazy_init_name_hash (&the_index,1 ); + nr_threads_used =test_lazy_init_name_hash (the_repository->index,1 ); t2m =getnanotime (); sum_multi += (t2m - t1m); - the_index.cache_nr = cache_nr_limit; -discard_index (&the_index); + the_repository->index->cache_nr = cache_nr_limit; +discard_index (the_repository->index);if (!nr_threads_used) printf(" [size %8d] [single %f] non-threaded code path used\n",
t/helper/test-read-cache.c +4 -5
@@ -1,4 +1,3 @@ -#define USE_THE_INDEX_VARIABLE #include "test-tool.h" #include "config.h" #include "read-cache-ll.h"
@@ -27,16 +26,16 @@ int cmd__read_cache(int argc, const char **argv)if (name) {int pos; -refresh_index (&the_index,REFRESH_QUIET , +refresh_index (the_repository->index,REFRESH_QUIET ,NULL ,NULL ,NULL ); - pos =index_name_pos (&the_index, name,strlen (name)); + pos =index_name_pos (the_repository->index, name,strlen (name));if (pos <0 )die ("%s not in index" , name);printf ("%s is%s up to date\n" , name, -ce_uptodate (the_index.cache[pos]) ?"" :" not" ); +ce_uptodate (the_repository->index->cache[pos]) ?"" :" not" );write_file (name,"%d\n" , i); } -discard_index (&the_index); +discard_index (the_repository->index); }return 0 ; }
t/helper/test-scrap-cache-tree.c +3 -4
@@ -1,4 +1,3 @@ -#define USE_THE_INDEX_VARIABLE #include "test-tool.h" #include "lockfile.h" #include "read-cache-ll.h"
@@ -15,9 +14,9 @@ int cmd__scrap_cache_tree(int ac UNUSED, const char **av UNUSED)repo_hold_locked_index (the_repository, &index_lock,LOCK_DIE_ON_ERROR );if (repo_read_index (the_repository) <0 )die ("unable to read index file" ); -cache_tree_free (&the_index.cache_tree); - the_index.cache_tree =NULL ; -if (write_locked_index (&the_index, &index_lock,COMMIT_LOCK )) +cache_tree_free (&the_repository->index->cache_tree); + the_repository->index->cache_tree =NULL ; +if (write_locked_index (the_repository->index, &index_lock,COMMIT_LOCK ))die ("unable to write index file" );return 0 ; }
t/helper/test-write-cache.c +1 -2
@@ -1,4 +1,3 @@ -#define USE_THE_INDEX_VARIABLE #include "test-tool.h" #include "lockfile.h" #include "read-cache-ll.h"
@@ -16,7 +15,7 @@ int cmd__write_cache(int argc, const char **argv)for (i =0 ; i < cnt; i++) {repo_hold_locked_index (the_repository, &index_lock,LOCK_DIE_ON_ERROR ); -if (write_locked_index (&the_index, &index_lock,COMMIT_LOCK )) +if (write_locked_index (the_repository->index, &index_lock,COMMIT_LOCK ))die ("unable to write index file" ); }
Signature · 1 line
2.44.GIT
PATCH v2 2/6 builtin: stop using `the_index`
In reply to Patrick SteinhardtConvert builtins to use the_repository->index instead of the_index.
--- builtin/add.c | 48 +++++++------- builtin/am.c | 36 +++++------ builtin/cat-file.c | 4 +- builtin/check-attr.c | 5 +- builtin/check-ignore.c | 7 +-- builtin/checkout-index.c | 22 +++---- builtin/checkout.c | 87 +++++++++++++------------ builtin/clean.c | 7 +-- builtin/commit.c | 81 ++++++++++++------------ builtin/describe.c | 3 +- builtin/diff-tree.c | 3 +- builtin/diff.c | 6 +- builtin/difftool.c | 4 +- builtin/merge-index.c | 17 +++-- builtin/merge-tree.c | 3 +- builtin/merge.c | 31 +++++---- builtin/mv.c | 68 ++++++++++---------- builtin/pull.c | 4 +- builtin/read-tree.c | 15 +++-- builtin/rebase.c | 3 +- builtin/replay.c | 1 - builtin/reset.c | 32 +++++----- builtin/rev-parse.c | 6 +- builtin/rm.c | 40 ++++++------ builtin/stash.c | 45 +++++++------ builtin/submodule--helper.c | 21 +++---- builtin/update-index.c | 122 ++++++++++++++++++------------------ builtin/write-tree.c | 6 +- 28 files changed, 356 insertions(+), 371 deletions(-)
builtin/add.c +24 -24
@@ -3,7 +3,7 @@* * Copyright (C) 2006 Linus Torvalds */ -#define USE_THE_INDEX_VARIABLE +#include "builtin.h" #include "advice.h" #include "config.h"
@@ -40,20 +40,20 @@ static int chmod_pathspec(struct pathspec *pathspec, char flip, int show_only) {int i, ret =0 ; -for (i =0 ; i < the_index.cache_nr; i++) { -struct cache_entry *ce = the_index.cache[i]; +for (i =0 ; i < the_repository->index->cache_nr; i++) { +struct cache_entry *ce = the_repository->index->cache[i];int err;if (!include_sparse && (ce_skip_worktree (ce) || - !path_in_sparse_checkout (ce->name, &the_index))) + !path_in_sparse_checkout (ce->name, the_repository->index)))continue ; -if (pathspec && !ce_path_match (&the_index, ce, pathspec,NULL )) +if (pathspec && !ce_path_match (the_repository->index, ce, pathspec,NULL ))continue ;if (!show_only) - err =chmod_index_entry (&the_index, ce, flip); + err =chmod_index_entry (the_repository->index, ce, flip);else err =S_ISREG (ce->ce_mode) ?0 :-1 ;
@@ -68,20 +68,20 @@ static int renormalize_tracked_files(const struct pathspec *pathspec, int flags) {int i, retval =0 ; -for (i =0 ; i < the_index.cache_nr; i++) { -struct cache_entry *ce = the_index.cache[i]; +for (i =0 ; i < the_repository->index->cache_nr; i++) { +struct cache_entry *ce = the_repository->index->cache[i];if (!include_sparse && (ce_skip_worktree (ce) || - !path_in_sparse_checkout (ce->name, &the_index))) + !path_in_sparse_checkout (ce->name, the_repository->index)))continue ;if (ce_stage (ce))continue ;/* do not touch unmerged paths */ if (!S_ISREG (ce->ce_mode) && !S_ISLNK (ce->ce_mode))continue ;/* do not touch non blobs */ -if (pathspec && !ce_path_match (&the_index, ce, pathspec,NULL )) +if (pathspec && !ce_path_match (the_repository->index, ce, pathspec,NULL ))continue ; - retval |=add_file_to_index (&the_index, ce->name, + retval |=add_file_to_index (the_repository->index, ce->name, flags |ADD_CACHE_RENORMALIZE ); }
@@ -100,11 +100,11 @@ static char *prune_directory(struct dir_struct *dir, struct pathspec *pathspec, i = dir->nr;while (--i >=0 ) {struct dir_entry *entry = *src++; -if (dir_path_match (&the_index, entry, pathspec, prefix, seen)) +if (dir_path_match (the_repository->index, entry, pathspec, prefix, seen)) *dst++ = entry; } dir->nr = dst - dir->entries; -add_pathspec_matches_against_index (pathspec, &the_index, seen, +add_pathspec_matches_against_index (pathspec, the_repository->index, seen,PS_IGNORE_SKIP_WORKTREE );return seen; }
@@ -119,14 +119,14 @@ static int refresh(int verbose, const struct pathspec *pathspec) (verbose ?REFRESH_IN_PORCELAIN :REFRESH_QUIET ); seen =xcalloc (pathspec->nr,1 ); -refresh_index (&the_index, flags, pathspec, seen, +refresh_index (the_repository->index, flags, pathspec, seen,_ ("Unstaged changes after refreshing the index:" ));for (i =0 ; i < pathspec->nr; i++) {if (!seen[i]) {const char *path = pathspec->items[i].original;if (matches_skip_worktree (pathspec, i, &skip_worktree_seen) || - !path_in_sparse_checkout (path, &the_index)) { + !path_in_sparse_checkout (path, the_repository->index)) {string_list_append (&only_match_skip_worktree, pathspec->items[i].original); }else {
@@ -335,12 +335,12 @@ static int add_files(struct dir_struct *dir, int flags)for (i =0 ; i < dir->nr; i++) {if (!include_sparse && - !path_in_sparse_checkout (dir->entries[i]->name, &the_index)) { + !path_in_sparse_checkout (dir->entries[i]->name, the_repository->index)) {string_list_append (&matched_sparse_paths, dir->entries[i]->name);continue ; } -if (add_file_to_index (&the_index, dir->entries[i]->name, flags)) { +if (add_file_to_index (the_repository->index, dir->entries[i]->name, flags)) {if (!ignore_add_errors)die (_ ("adding files failed" )); exit_status =1 ;
@@ -458,8 +458,8 @@ int cmd_add(int argc, const char **argv, const char *prefix)if (repo_read_index_preload (the_repository, &pathspec,0 ) <0 )die (_ ("index file corrupt" )); -die_in_unpopulated_submodule (&the_index, prefix); -die_path_inside_submodule (&the_index, &pathspec); +die_in_unpopulated_submodule (the_repository->index, prefix); +die_path_inside_submodule (the_repository->index, &pathspec);if (add_new_files) {int baselen;
@@ -471,7 +471,7 @@ int cmd_add(int argc, const char **argv, const char *prefix) }/* This picks up the paths that are not tracked */ - baselen =fill_directory (&dir, &the_index, &pathspec); + baselen =fill_directory (&dir, the_repository->index, &pathspec);if (pathspec.nr) seen =prune_directory (&dir, &pathspec, baselen); }
@@ -488,7 +488,7 @@ int cmd_add(int argc, const char **argv, const char *prefix)if (!seen) seen =find_pathspecs_matching_against_index (&pathspec, - &the_index,PS_IGNORE_SKIP_WORKTREE ); + the_repository->index,PS_IGNORE_SKIP_WORKTREE );/* * file_exists() assumes exact match
@@ -524,8 +524,8 @@ int cmd_add(int argc, const char **argv, const char *prefix) !file_exists(path)) {if (ignore_missing) {int dtype =DT_UNKNOWN ; -if (is_excluded (&dir, &the_index, path, &dtype)) -dir_add_ignored (&dir, &the_index, +if (is_excluded (&dir, the_repository->index, path, &dtype)) +dir_add_ignored (&dir, the_repository->index, path, pathspec.items[i].len); }else die(_("pathspec '%s' did not match any files"),
@@ -566,7 +566,7 @@ int cmd_add(int argc, const char **argv, const char *prefix)end_odb_transaction (); finish: -if (write_locked_index (&the_index, &lock_file, +if (write_locked_index (the_repository->index, &lock_file,COMMIT_LOCK |SKIP_IF_UNCHANGED ))die (_ ("unable to write new index file" ));
builtin/am.c +18 -18
@@ -3,7 +3,7 @@* * Based on git-am.sh by Junio C Hamano. */ -#define USE_THE_INDEX_VARIABLE +#include "builtin.h" #include "abspath.h" #include "advice.h"
@@ -1536,8 +1536,8 @@ static int run_apply(const struct am_state *state, const char *index_file)if (index_file) {/* Reload index as apply_all_patches() will have modified it. */ -discard_index (&the_index); -read_index_from (&the_index, index_file,get_git_dir ()); +discard_index (the_repository->index); +read_index_from (the_repository->index, index_file,get_git_dir ()); }return 0 ;
@@ -1579,10 +1579,10 @@ static int fall_back_threeway(const struct am_state *state, const char *index_paif (build_fake_ancestor (state, index_path))return error ("could not build fake ancestor" ); -discard_index (&the_index); -read_index_from (&the_index, index_path,get_git_dir ()); +discard_index (the_repository->index); +read_index_from (the_repository->index, index_path,get_git_dir ()); -if (write_index_as_tree (&orig_tree, &the_index, index_path,0 ,NULL )) +if (write_index_as_tree (&orig_tree, the_repository->index, index_path,0 ,NULL ))return error (_ ("Repository lacks necessary blobs to fall back on 3-way merge." ));say (state, stdout,_ ("Using index info to reconstruct a base tree..." ));
@@ -1608,12 +1608,12 @@ static int fall_back_threeway(const struct am_state *state, const char *index_pareturn error (_ ("Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." )); -if (write_index_as_tree (&their_tree, &the_index, index_path,0 ,NULL )) +if (write_index_as_tree (&their_tree, the_repository->index, index_path,0 ,NULL ))return error ("could not write tree" );say (state, stdout,_ ("Falling back to patching base and 3-way merge..." )); -discard_index (&the_index); +discard_index (the_repository->index);repo_read_index (the_repository);/*
@@ -1660,7 +1660,7 @@ static void do_commit(const struct am_state *state)if (!state->no_verify &&run_hooks ("pre-applypatch" ))exit (1 ); -if (write_index_as_tree (&tree, &the_index,get_index_file (),0 ,NULL )) +if (write_index_as_tree (&tree, the_repository->index,get_index_file (),0 ,NULL ))die (_ ("git write-tree failed to write a tree" ));if (!repo_get_oid_commit (the_repository,"HEAD" , &parent)) {
@@ -1948,7 +1948,7 @@ static void am_resolve(struct am_state *state, int allow_empty) } } -if (unmerged_index (&the_index)) { +if (unmerged_index (the_repository->index)) {printf_ln (_ ("You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as such.\n" "You might run `git rm` on a file to accept \"deleted by them\" for it." ));
@@ -1987,12 +1987,12 @@ static int fast_forward_to(struct tree *head, struct tree *remote, int reset)repo_hold_locked_index (the_repository, &lock_file,LOCK_DIE_ON_ERROR ); -refresh_index (&the_index,REFRESH_QUIET ,NULL ,NULL ,NULL ); +refresh_index (the_repository->index,REFRESH_QUIET ,NULL ,NULL ,NULL );memset (&opts,0 ,sizeof (opts)); opts.head_idx =1 ; - opts.src_index = &the_index; - opts.dst_index = &the_index; + opts.src_index = the_repository->index; + opts.dst_index = the_repository->index; opts.update =1 ; opts.merge =1 ; opts.reset = reset ?UNPACK_RESET_PROTECT_UNTRACKED :0 ;
@@ -2006,7 +2006,7 @@ static int fast_forward_to(struct tree *head, struct tree *remote, int reset)return -1 ; } -if (write_locked_index (&the_index, &lock_file,COMMIT_LOCK )) +if (write_locked_index (the_repository->index, &lock_file,COMMIT_LOCK ))die (_ ("unable to write new index file" ));return 0 ;
@@ -2029,8 +2029,8 @@ static int merge_tree(struct tree *tree)memset (&opts,0 ,sizeof (opts)); opts.head_idx =1 ; - opts.src_index = &the_index; - opts.dst_index = &the_index; + opts.src_index = the_repository->index; + opts.dst_index = the_repository->index; opts.merge =1 ; opts.fn = oneway_merge;init_tree_desc (&t[0 ], &tree->object.oid, tree->buffer, tree->size);
@@ -2040,7 +2040,7 @@ static int merge_tree(struct tree *tree)return -1 ; } -if (write_locked_index (&the_index, &lock_file,COMMIT_LOCK )) +if (write_locked_index (the_repository->index, &lock_file,COMMIT_LOCK ))die (_ ("unable to write new index file" ));return 0 ;
@@ -2068,7 +2068,7 @@ static int clean_index(const struct object_id *head, const struct object_id *remif (fast_forward_to (head_tree, head_tree,1 ))return -1 ; -if (write_index_as_tree (&index, &the_index,get_index_file (),0 ,NULL )) +if (write_index_as_tree (&index, the_repository->index,get_index_file (),0 ,NULL ))return -1 ; index_tree =parse_tree_indirect (&index);
builtin/cat-file.c +2 -2
@@ -3,7 +3,7 @@* * Copyright (C) Linus Torvalds, 2005 */ -#define USE_THE_INDEX_VARIABLE +#include "builtin.h" #include "config.h" #include "convert.h"
@@ -77,7 +77,7 @@ static int filter_object(const char *path, unsigned mode,struct checkout_metadata meta;init_checkout_metadata (&meta,NULL ,NULL , oid); -if (convert_to_working_tree (&the_index, path, *buf, *size, &strbuf, &meta)) { +if (convert_to_working_tree (the_repository->index, path, *buf, *size, &strbuf, &meta)) {free (*buf); *size = strbuf.len; *buf =strbuf_detach (&strbuf,NULL );
builtin/check-attr.c +2 -3
@@ -1,4 +1,3 @@ -#define USE_THE_INDEX_VARIABLE #include "builtin.h" #include "config.h" #include "attr.h"
@@ -71,9 +70,9 @@ static void check_attr(const char *prefix, struct attr_check *check,prefix_path (prefix, prefix ?strlen (prefix) :0 , file);if (collect_all) { -git_all_attrs (&the_index, full_path, check); +git_all_attrs (the_repository->index, full_path, check); }else { -git_check_attr (&the_index, full_path, check); +git_check_attr (the_repository->index, full_path, check); }output_attr (check, file);
builtin/check-ignore.c +3 -4
@@ -1,4 +1,3 @@ -#define USE_THE_INDEX_VARIABLE #include "builtin.h" #include "config.h" #include "dir.h"
@@ -95,21 +94,21 @@ static int check_ignore(struct dir_struct *dir,PATHSPEC_KEEP_ORDER , prefix, argv); -die_path_inside_submodule (&the_index, &pathspec); +die_path_inside_submodule (the_repository->index, &pathspec);/* * look for pathspecs matching entries in the index, since these * should not be ignored, in order to be consistent with * 'git status', 'git add' etc. */ - seen =find_pathspecs_matching_against_index (&pathspec, &the_index, + seen =find_pathspecs_matching_against_index (&pathspec, the_repository->index,PS_HEED_SKIP_WORKTREE );for (i =0 ; i < pathspec.nr; i++) { full_path = pathspec.items[i].match; pattern =NULL ;if (!seen[i]) {int dtype =DT_UNKNOWN ; - pattern =last_matching_pattern (dir, &the_index, + pattern =last_matching_pattern (dir, the_repository->index, full_path, &dtype);if (!verbose && pattern && pattern->flags &PATTERN_FLAG_NEGATIVE )
builtin/checkout-index.c +11 -11
@@ -4,7 +4,7 @@* Copyright (C) 2005 Linus Torvalds * */ -#define USE_THE_INDEX_VARIABLE +#include "builtin.h" #include "config.h" #include "gettext.h"
@@ -69,7 +69,7 @@ static void write_tempfile_record(const char *name, const char *prefix)static int checkout_file (const char *name,const char *prefix) {int namelen =strlen (name); -int pos =index_name_pos (&the_index, name, namelen); +int pos =index_name_pos (the_repository->index, name, namelen);int has_same_name =0 ;int is_file =0 ;int is_skipped =1 ;
@@ -79,8 +79,8 @@ static int checkout_file(const char *name, const char *prefix)if (pos <0 ) pos = -pos -1 ; -while (pos < the_index.cache_nr) { -struct cache_entry *ce = the_index.cache[pos]; +while (pos <the_repository->index->cache_nr) { +struct cache_entry *ce =the_repository->index->cache[pos];if (ce_namelen (ce) != namelen ||memcmp (ce->name, name, namelen))break ;
@@ -140,8 +140,8 @@ static int checkout_all(const char *prefix, int prefix_length)int i, errs =0 ;struct cache_entry *last_ce =NULL ; -for (i =0 ; i < the_index.cache_nr ; i++) { -struct cache_entry *ce = the_index.cache[i]; +for (i =0 ; i < the_repository->index->cache_nr ; i++) { +struct cache_entry *ce = the_repository->index->cache[i];if (S_ISSPARSEDIR (ce->ce_mode)) {if (!ce_skip_worktree (ce))
@@ -154,8 +154,8 @@ static int checkout_all(const char *prefix, int prefix_length)* first entry inside the expanded sparse directory). */ if (ignore_skip_worktree) { -ensure_full_index (&the_index); - ce = the_index.cache[i]; +ensure_full_index (the_repository->index); + ce = the_repository->index->cache[i]; } }
@@ -260,7 +260,7 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix) argc =parse_options (argc, argv, prefix, builtin_checkout_index_options, builtin_checkout_index_usage,0 ); - state.istate = &the_index; + state.istate = the_repository->index; state.force = force; state.quiet = quiet; state.not_new = not_new;
@@ -280,7 +280,7 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix)*/ if (index_opt && !state.base_dir_len && !to_tempfile) { state.refresh_cache =1 ; - state.istate = &the_index; + state.istate = the_repository->index;repo_hold_locked_index (the_repository, &lock_file,LOCK_DIE_ON_ERROR ); }
@@ -339,7 +339,7 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix)return 1 ;if (is_lock_file_locked (&lock_file) && -write_locked_index (&the_index, &lock_file,COMMIT_LOCK )) +write_locked_index (the_repository->index, &lock_file,COMMIT_LOCK ))die ("Unable to write new index file" );return 0 ; }
builtin/checkout.c +43 -44
250 lines not on this page · raw message
builtin/clean.c +3 -4
@@ -6,7 +6,6 @@* Based on git-clean.sh by Pavel Roskin */ -#define USE_THE_INDEX_VARIABLE #include "builtin.h" #include "abspath.h" #include "config.h"
@@ -714,7 +713,7 @@ static int filter_by_patterns_cmd(void)for_each_string_list_item (item, &del_list) {int dtype =DT_UNKNOWN ; -if (is_excluded (&dir, &the_index, item->string, &dtype)) { +if (is_excluded (&dir, the_repository->index, item->string, &dtype)) { *item->string ='\0' ; changed++; }
@@ -1021,7 +1020,7 @@ int cmd_clean(int argc, const char **argv, const char *prefix)PATHSPEC_PREFER_CWD , prefix, argv); -fill_directory (&dir, &the_index, &pathspec); +fill_directory (&dir, the_repository->index, &pathspec);correct_untracked_entries (&dir);for (i =0 ; i < dir.nr; i++) {
@@ -1029,7 +1028,7 @@ int cmd_clean(int argc, const char **argv, const char *prefix)struct stat st;const char *rel; -if (!index_name_is_other (&the_index, ent->name, ent->len)) +if (!index_name_is_other (the_repository->index, ent->name, ent->len))continue ;if (lstat (ent->name, &st))
builtin/commit.c +40 -41
208 lines not on this page · raw message
builtin/describe.c +1 -2
@@ -1,4 +1,3 @@ -#define USE_THE_INDEX_VARIABLE #include "builtin.h" #include "config.h" #include "environment.h"
@@ -674,7 +673,7 @@ int cmd_describe(int argc, const char **argv, const char *prefix)prepare_repo_settings (the_repository); the_repository->settings.command_requires_full_index =0 ;repo_read_index (the_repository); -refresh_index (&the_index,REFRESH_QUIET |REFRESH_UNMERGED , +refresh_index (the_repository->index,REFRESH_QUIET |REFRESH_UNMERGED ,NULL ,NULL ,NULL ); fd =repo_hold_locked_index (the_repository, &index_lock,0 );
builtin/diff-tree.c +1 -2
@@ -1,4 +1,3 @@ -#define USE_THE_INDEX_VARIABLE #include "builtin.h" #include "config.h" #include "diff.h"
@@ -206,7 +205,7 @@ int cmd_diff_tree(int argc, const char **argv, const char *prefix) opt->diffopt.rotate_to_strict =0 ; opt->diffopt.no_free =1 ;if (opt->diffopt.detect_rename) { -if (!the_index.cache) +if (the_repository->index->cache)repo_read_index (the_repository); opt->diffopt.setup |=DIFF_SETUP_USE_SIZE_CACHE ; }
builtin/diff.c +3 -3
@@ -3,7 +3,7 @@* * Copyright (c) 2006 Junio C Hamano */ -#define USE_THE_INDEX_VARIABLE +#include "builtin.h" #include "config.h" #include "ewah/ewok.h"
@@ -239,9 +239,9 @@ static void refresh_index_quietly(void) fd =repo_hold_locked_index (the_repository, &lock_file,0 );if (fd <0 )return ; -discard_index (&the_index); +discard_index (the_repository->index);repo_read_index (the_repository); -refresh_index (&the_index,REFRESH_QUIET |REFRESH_UNMERGED ,NULL ,NULL , +refresh_index (the_repository->index,REFRESH_QUIET |REFRESH_UNMERGED ,NULL ,NULL ,NULL );repo_update_index_if_able (the_repository, &lock_file); }
builtin/difftool.c +2 -2
@@ -11,7 +11,7 @@* * Copyright (C) 2016 Johannes Schindelin */ -#define USE_THE_INDEX_VARIABLE +#include "builtin.h" #include "abspath.h" #include "config.h"
@@ -117,7 +117,7 @@ static int use_wt_file(const char *workdir, const char *name,int fd =open (buf.buf,O_RDONLY );if (fd >=0 && - !index_fd (&the_index, &wt_oid, fd, &st,OBJ_BLOB , name,0 )) { + !index_fd (the_repository->index, &wt_oid, fd, &st,OBJ_BLOB , name,0 )) {if (is_null_oid (oid)) {oidcpy (oid, &wt_oid); use =1 ;
builtin/merge-index.c +8 -9
@@ -1,4 +1,3 @@ -#define USE_THE_INDEX_VARIABLE #include "builtin.h" #include "hex.h" #include "read-cache-ll.h"
@@ -18,11 +17,11 @@ static int merge_entry(int pos, const char *path)char ownbuf[4 ][60 ];struct child_process cmd =CHILD_PROCESS_INIT ; -if (pos >= the_index.cache_nr) +if (pos >= the_repository->index->cache_nr)die ("git merge-index: %s not in the cache" , path); found =0 ; do { - const struct cache_entry *ce = the_index.cache[pos]; + const struct cache_entry *ce = the_repository->index->cache[pos]; int stage = ce_stage(ce); if (strcmp(ce->name, path))
@@ -32,7 +31,7 @@ static int merge_entry(int pos, const char *path)xsnprintf (ownbuf[stage],sizeof (ownbuf[stage]),"%o" , ce->ce_mode); arguments[stage] = hexbuf[stage]; arguments[stage +4 ] = ownbuf[stage]; - }while (++pos < the_index.cache_nr); + }while (++pos < the_repository->index->cache_nr);if (!found)die ("git merge-index: %s not in the cache" , path);
@@ -51,7 +50,7 @@ static int merge_entry(int pos, const char *path)static void merge_one_path (const char *path) { -int pos =index_name_pos (&the_index, path,strlen (path)); +int pos =index_name_pos (the_repository->index, path,strlen (path));/* * If it already exists in the cache as stage0, it's
@@ -65,9 +64,9 @@ static void merge_all(void) {int i;/* TODO: audit for interaction with sparse-index. */ -ensure_full_index (&the_index); -for (i =0 ; i < the_index.cache_nr; i++) { -const struct cache_entry *ce = the_index.cache[i]; +ensure_full_index (the_repository->index); +for (i =0 ; i < the_repository->index->cache_nr; i++) { +const struct cache_entry *ce = the_repository->index->cache[i];if (!ce_stage (ce))continue ; i +=merge_entry (i, ce->name)-1 ;
@@ -89,7 +88,7 @@ int cmd_merge_index(int argc, const char **argv, const char *prefix UNUSED)repo_read_index (the_repository);/* TODO: audit for interaction with sparse-index. */ -ensure_full_index (&the_index); +ensure_full_index (the_repository->index); i =1 ;if (!strcmp (argv[i],"-o" )) {
builtin/merge-tree.c +1 -2
@@ -1,4 +1,3 @@ -#define USE_THE_INDEX_VARIABLE #include "builtin.h" #include "tree-walk.h" #include "xdiff-interface.h"
@@ -364,7 +363,7 @@ static void trivial_merge_trees(struct tree_desc t[3], const char *base)setup_traverse_info (&info, base); info.fn = threeway_callback; -traverse_trees (&the_index,3 , t, &info); +traverse_trees (the_repository->index,3 , t, &info); } static void *get_tree_descriptor(struct repository *r,
builtin/merge.c +15 -16
@@ -6,7 +6,6 @@* Based on git-merge.sh by Junio C Hamano. */ -#define USE_THE_INDEX_VARIABLE #include "builtin.h" #include "abspath.h" #include "advice.h"
@@ -300,7 +299,7 @@ static int save_state(struct object_id *stash)int rc =-1 ; fd =repo_hold_locked_index (the_repository, &lock_file,0 ); -refresh_index (&the_index,REFRESH_QUIET ,NULL ,NULL ,NULL ); +refresh_index (the_repository->index,REFRESH_QUIET ,NULL ,NULL ,NULL );if (0 <= fd)repo_update_index_if_able (the_repository, &lock_file);rollback_lock_file (&lock_file);
@@ -372,7 +371,7 @@ static void restore_state(const struct object_id *head,run_command (&cmd); refresh_cache: -discard_index (&the_index); +discard_index (the_repository->index);if (repo_read_index (the_repository) <0 )die (_ ("could not read index" )); }
@@ -657,8 +656,8 @@ static int read_tree_trivial(struct object_id *common, struct object_id *head,memset (&opts,0 ,sizeof (opts)); opts.head_idx =2 ; - opts.src_index = &the_index; - opts.dst_index = &the_index; + opts.src_index = the_repository->index; + opts.dst_index = the_repository->index; opts.update =1 ; opts.verbose_update =1 ; opts.trivial_merges_only =1 ;
@@ -674,7 +673,7 @@ static int read_tree_trivial(struct object_id *common, struct object_id *head,if (!trees[nr_trees++])return -1 ; opts.fn = threeway_merge; -cache_tree_free (&the_index.cache_tree); +cache_tree_free (&the_repository->index->cache_tree);for (i =0 ; i < nr_trees; i++) {parse_tree (trees[i]); init_tree_desc(t+i, &trees[i]->object.oid,
@@ -687,7 +686,7 @@ static int read_tree_trivial(struct object_id *common, struct object_id *head,static void write_tree_trivial (struct object_id *oid) { -if (write_index_as_tree (oid, &the_index,get_index_file (),0 ,NULL )) +if (write_index_as_tree (oid, the_repository->index,get_index_file (),0 ,NULL ))die (_ ("git write-tree failed to write a tree" )); }
@@ -745,7 +744,7 @@ static int try_merge_strategy(const char *strategy, struct commit_list *common,rollback_lock_file (&lock);return 2 ; } -if (write_locked_index (&the_index, &lock, +if (write_locked_index (the_repository->index, &lock,COMMIT_LOCK |SKIP_IF_UNCHANGED ))die (_ ("unable to write %s" ),get_index_file ());return clean ?0 :1 ;
@@ -768,8 +767,8 @@ static int count_unmerged_entries(void) {int i, ret =0 ; -for (i =0 ; i < the_index.cache_nr; i++) -if (ce_stage (the_index.cache[i])) +for (i =0 ; i < the_repository->index->cache_nr; i++) +if (ce_stage (the_repository->index->cache[i])) ret++;return ret;
@@ -843,9 +842,9 @@ static void prepare_to_commit(struct commit_list *remoteheads)* the editor and after we invoke run_status above. */ if (invoked_hook) -discard_index (&the_index); +discard_index (the_repository->index); } -read_index_from (&the_index, index_file,get_git_dir ()); +read_index_from (the_repository->index, index_file,get_git_dir ());strbuf_addbuf (&msg, &merge_msg);if (squash)BUG ("the control must not reach here under --squash" );
@@ -957,7 +956,7 @@ static int suggest_conflicts(void)* Thus, we will get the cleanup mode which is returned when we _are_ * using an editor. */ -append_conflicts_hint (&the_index, &msgbuf, +append_conflicts_hint (the_repository->index, &msgbuf,get_cleanup_mode (cleanup_arg,1 ));fputs (msgbuf.buf, fp);strbuf_release (&msgbuf);
@@ -1386,7 +1385,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)else die (_ ("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." )); } -resolve_undo_clear_index (&the_index); +resolve_undo_clear_index (the_repository->index);if (option_edit <0 ) option_edit =default_edit_option ();
@@ -1595,7 +1594,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)* We are not doing octopus, not fast-forward, and have * only one common. */ -refresh_index (&the_index,REFRESH_QUIET ,NULL ,NULL ,NULL ); +refresh_index (the_repository->index,REFRESH_QUIET ,NULL ,NULL ,NULL );if (allow_trivial && fast_forward !=FF_ONLY ) {/* * Must first ensure that index matches HEAD before
@@ -1784,6 +1783,6 @@ int cmd_merge(int argc, const char **argv, const char *prefix) }strbuf_release (&buf);free (branch_to_free); -discard_index (&the_index); +discard_index (the_repository->index);return ret; }
builtin/mv.c +34 -34
207 lines not on this page · raw message
builtin/pull.c +2 -2
@@ -5,7 +5,7 @@* * Fetch one or more remote refs and merge it/them into the current HEAD. */ -#define USE_THE_INDEX_VARIABLE +#include "builtin.h" #include "advice.h" #include "config.h"
@@ -1044,7 +1044,7 @@ int cmd_pull(int argc, const char **argv, const char *prefix)if (opt_autostash ==-1 ) opt_autostash = config_autostash; -if (is_null_oid (&orig_head) && !is_index_unborn (&the_index)) +if (is_null_oid (&orig_head) && !is_index_unborn (the_repository->index))die (_ ("Updating an unborn branch with changes added to the index." ));if (!opt_autostash)
builtin/read-tree.c +7 -8
@@ -4,7 +4,6 @@* Copyright (C) Linus Torvalds, 2005 */ -#define USE_THE_INDEX_VARIABLE #include "builtin.h" #include "config.h" #include "gettext.h"
@@ -159,8 +158,8 @@ int cmd_read_tree(int argc, const char **argv, const char *cmd_prefix)memset (&opts,0 ,sizeof (opts)); opts.head_idx =-1 ; - opts.src_index = &the_index; - opts.dst_index = &the_index; + opts.src_index = the_repository->index; + opts.dst_index = the_repository->index;git_config (git_read_tree_config,NULL );
@@ -197,7 +196,7 @@ int cmd_read_tree(int argc, const char **argv, const char *cmd_prefix)die (_ ("You need to resolve your current index first" )); stage = opts.merge =1 ; } -resolve_undo_clear_index (&the_index); +resolve_undo_clear_index (the_repository->index);for (i =0 ; i < argc; i++) {const char *arg = argv[i];
@@ -225,7 +224,7 @@ int cmd_read_tree(int argc, const char **argv, const char *cmd_prefix)setup_work_tree ();if (opts.skip_sparse_checkout) -ensure_full_index (&the_index); +ensure_full_index (the_repository->index);if (opts.merge) {switch (stage -1 ) {
@@ -237,7 +236,7 @@ int cmd_read_tree(int argc, const char **argv, const char *cmd_prefix)break ;case 2 : opts.fn = twoway_merge; - opts.initial_checkout =is_index_unborn (&the_index); + opts.initial_checkout =is_index_unborn (the_repository->index);break ;case 3 :default :
@@ -258,7 +257,7 @@ int cmd_read_tree(int argc, const char **argv, const char *cmd_prefix)if (nr_trees ==1 && !opts.prefix) opts.skip_cache_tree_update =1 ; -cache_tree_free (&the_index.cache_tree); +cache_tree_free (&the_repository->index->cache_tree);for (i =0 ; i < nr_trees; i++) {struct tree *tree = trees[i];if (parse_tree (tree) <0 )
@@ -282,7 +281,7 @@ int cmd_read_tree(int argc, const char **argv, const char *cmd_prefix) the_repository->index, trees[0]); -if (write_locked_index (&the_index, &lock_file,COMMIT_LOCK )) +if (write_locked_index (the_repository->index, &lock_file,COMMIT_LOCK ))die ("unable to write new index file" );return 0 ; }
builtin/rebase.c +1 -2
@@ -4,7 +4,6 @@* Copyright (c) 2018 Pratik Karki */ -#define USE_THE_INDEX_VARIABLE #include "builtin.h" #include "abspath.h" #include "environment.h"
@@ -295,7 +294,7 @@ static int do_interactive_rebase(struct rebase_options *opts, unsigned flags)if (ret)error (_ ("could not generate todo list" ));else { -discard_index (&the_index); +discard_index (the_repository->index);if (todo_list_parse_insn_buffer (the_repository, todo_list.buf.buf, &todo_list))BUG ("unusable todo list" );
builtin/replay.c +0 -1
@@ -2,7 +2,6 @@* "git replay" builtin command */ -#define USE_THE_INDEX_VARIABLE #include "git-compat-util.h" #include "builtin.h"
builtin/reset.c +16 -16
@@ -7,7 +7,7 @@* * Copyright (c) 2005, 2006 Linus Torvalds and Junio C Hamano */ -#define USE_THE_INDEX_VARIABLE +#include "builtin.h" #include "advice.h" #include "config.h"
@@ -66,8 +66,8 @@ static int reset_index(const char *ref, const struct object_id *oid, int reset_tmemset (&opts,0 ,sizeof (opts)); opts.head_idx =1 ; - opts.src_index = &the_index; - opts.dst_index = &the_index; + opts.src_index = the_repository->index; + opts.dst_index = the_repository->index; opts.fn = oneway_merge; opts.merge =1 ;init_checkout_metadata (&opts.meta, ref, oid,NULL );
@@ -159,11 +159,11 @@ static void update_index_from_diff(struct diff_queue_struct *q,struct cache_entry *ce;if (!is_in_reset_tree && !intent_to_add) { -remove_file_from_index (&the_index, one->path); +remove_file_from_index (the_repository->index, one->path);continue ; } - ce =make_cache_entry (&the_index, one->mode, &one->oid, one->path, + ce =make_cache_entry (the_repository->index, one->mode, &one->oid, one->path,0 ,0 );/*
@@ -174,9 +174,9 @@ static void update_index_from_diff(struct diff_queue_struct *q,* if this entry is outside the sparse cone - this is necessary * to properly construct the reset sparse directory. */ - pos =index_name_pos (&the_index, one->path,strlen (one->path)); -if ((pos >=0 &&ce_skip_worktree (the_index.cache[pos])) || - (pos <0 && !path_in_sparse_checkout (one->path, &the_index))) + pos =index_name_pos (the_repository->index, one->path,strlen (one->path)); +if ((pos >=0 &&ce_skip_worktree (the_repository->index->cache[pos])) || + (pos <0 && !path_in_sparse_checkout (one->path, the_repository->index))) ce->ce_flags |=CE_SKIP_WORKTREE ;if (!ce)
@@ -186,7 +186,7 @@ static void update_index_from_diff(struct diff_queue_struct *q, ce->ce_flags |=CE_INTENT_TO_ADD ;set_object_name_for_intent_to_add_entry (ce); } -add_index_entry (&the_index, ce, +add_index_entry (the_repository->index, ce,ADD_CACHE_OK_TO_ADD |ADD_CACHE_OK_TO_REPLACE ); } }
@@ -208,8 +208,8 @@ static int read_from_tree(const struct pathspec *pathspec, opt.change = diff_change; opt.add_remove = diff_addremove; -if (pathspec->nr &&pathspec_needs_expanded_index (&the_index, pathspec)) -ensure_full_index (&the_index); +if (pathspec->nr &&pathspec_needs_expanded_index (the_repository->index, pathspec)) +ensure_full_index (the_repository->index);if (do_diff_cache (tree_oid, &opt))return 1 ;
@@ -235,7 +235,7 @@ static void set_reflog_message(struct strbuf *sb, const char *action,static void die_if_unmerged_cache (int reset_type) { -if (is_merge () ||unmerged_index (&the_index)) +if (is_merge () ||unmerged_index (the_repository->index))die (_ ("Cannot do a %s reset in the middle of a merge." ),_ (reset_type_names[reset_type]));
@@ -470,12 +470,12 @@ int cmd_reset(int argc, const char **argv, const char *prefix) update_ref_status =1 ; goto cleanup; } - the_index.updated_skipworktree =1 ; + the_repository->index->updated_skipworktree =1 ;if (!no_refresh &&get_git_work_tree ()) {uint64_t t_begin, t_delta_in_ms; t_begin =getnanotime (); -refresh_index (&the_index, flags,NULL ,NULL , +refresh_index (the_repository->index, flags,NULL ,NULL ,_ ("Unstaged changes after reset:" )); t_delta_in_ms = (getnanotime () - t_begin) /1000000 ;if (!quiet &&advice_enabled (ADVICE_RESET_NO_REFRESH_WARNING ) && t_delta_in_ms >REFRESH_INDEX_DELAY_WARNING_IN_MS ) {
@@ -501,7 +501,7 @@ int cmd_reset(int argc, const char **argv, const char *prefix)free (ref); } -if (write_locked_index (&the_index, &lock,COMMIT_LOCK )) +if (write_locked_index (the_repository->index, &lock,COMMIT_LOCK ))die (_ ("Could not write new index file." )); }
@@ -516,7 +516,7 @@ int cmd_reset(int argc, const char **argv, const char *prefix)if (!pathspec.nr)remove_branch_state (the_repository,0 ); -discard_index (&the_index); +discard_index (the_repository->index); cleanup:clear_pathspec (&pathspec);
builtin/rev-parse.c +3 -3
@@ -3,7 +3,7 @@* * Copyright (C) Linus Torvalds, 2005 */ -#define USE_THE_INDEX_VARIABLE +#include "builtin.h" #include "abspath.h" #include "config.h"
@@ -1049,8 +1049,8 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)if (!strcmp (arg,"--shared-index-path" )) {if (repo_read_index (the_repository) <0 )die (_ ("Could not read the index" )); -if (the_index.split_index) { -const struct object_id *oid = &the_index.split_index->base_oid; +if (the_repository->index->split_index) { +const struct object_id *oid = &the_repository->index->split_index->base_oid;const char *path =git_path ("sharedindex.%s" ,oid_to_hex (oid));print_path (path, prefix, format,DEFAULT_RELATIVE ); }
builtin/rm.c +20 -20
@@ -3,7 +3,7 @@* * Copyright (C) Linus Torvalds 2006 */ -#define USE_THE_INDEX_VARIABLE +#include "builtin.h" #include "advice.h" #include "config.h"
@@ -41,8 +41,8 @@ static int get_ours_cache_pos(const char *path, int pos) {int i = -pos -1 ; -while ((i < the_index.cache_nr) && !strcmp (the_index.cache[i]->name, path)) { -if (ce_stage (the_index.cache[i]) ==2 ) +while ((i < the_repository->index->cache_nr) && !strcmp (the_repository->index->cache[i]->name, path)) { +if (ce_stage (the_repository->index->cache[i]) ==2 )return i; i++; }
@@ -78,13 +78,13 @@ static void submodules_absorb_gitdir_if_needed(void)int pos;const struct cache_entry *ce; - pos =index_name_pos (&the_index, name,strlen (name)); + pos =index_name_pos (the_repository->index, name,strlen (name));if (pos <0 ) { pos =get_ours_cache_pos (name, pos);if (pos <0 )continue ; } - ce = the_index.cache[pos]; + ce = the_repository->index->cache[pos]; if (!S_ISGITLINK(ce->ce_mode) || !file_exists(ce->name) ||
@@ -122,7 +122,7 @@ static int check_local_mod(struct object_id *head, int index_only)int local_changes =0 ;int staged_changes =0 ; - pos =index_name_pos (&the_index, name,strlen (name)); + pos =index_name_pos (the_repository->index, name,strlen (name));if (pos <0 ) {/* * Skip unmerged entries except for populated submodules
@@ -132,11 +132,11 @@ static int check_local_mod(struct object_id *head, int index_only)if (pos <0 )continue ; -if (!S_ISGITLINK (the_index.cache[pos]->ce_mode) || +if (!S_ISGITLINK (the_repository->index->cache[pos]->ce_mode) ||is_empty_dir (name))continue ; } - ce = the_index.cache[pos]; + ce = the_repository->index->cache[pos];if (lstat (ce->name, &st) <0 ) {if (!is_missing_file_error (errno))
@@ -173,7 +173,7 @@ static int check_local_mod(struct object_id *head, int index_only)* Is the index different from the file in the work tree? * If it's a submodule, is its work tree modified? */ - if (ie_match_stat(&the_index, ce, &st, 0) || + if (ie_match_stat(the_repository->index, ce, &st, 0) || (S_ISGITLINK(ce->ce_mode) && bad_to_remove_submodule(ce->name, SUBMODULE_REMOVAL_DIE_ON_ERROR |
@@ -301,27 +301,27 @@ int cmd_rm(int argc, const char **argv, const char *prefix)if (repo_read_index (the_repository) <0 )die (_ ("index file corrupt" )); -refresh_index (&the_index,REFRESH_QUIET |REFRESH_UNMERGED , &pathspec,NULL ,NULL ); +refresh_index (the_repository->index,REFRESH_QUIET |REFRESH_UNMERGED , &pathspec,NULL ,NULL ); seen =xcalloc (pathspec.nr,1 ); -if (pathspec_needs_expanded_index (&the_index, &pathspec)) -ensure_full_index (&the_index); +if (pathspec_needs_expanded_index (the_repository->index, &pathspec)) +ensure_full_index (the_repository->index); -for (i =0 ; i < the_index.cache_nr; i++) { -const struct cache_entry *ce = the_index.cache[i]; +for (i =0 ; i < the_repository->index->cache_nr; i++) { +const struct cache_entry *ce = the_repository->index->cache[i];if (!include_sparse && (ce_skip_worktree (ce) || - !path_in_sparse_checkout (ce->name, &the_index))) + !path_in_sparse_checkout (ce->name, the_repository->index)))continue ; -if (!ce_path_match (&the_index, ce, &pathspec, seen)) +if (!ce_path_match (the_repository->index, ce, &pathspec, seen))continue ;ALLOC_GROW (list.entry, list.nr +1 , list.alloc); list.entry[list.nr].name =xstrdup (ce->name); list.entry[list.nr].is_submodule =S_ISGITLINK (ce->ce_mode);if (list.entry[list.nr++].is_submodule && - !is_staging_gitmodules_ok (&the_index)) + !is_staging_gitmodules_ok (the_repository->index))die (_ ("please stage your changes to .gitmodules or stash them to proceed" )); }
@@ -391,7 +391,7 @@ int cmd_rm(int argc, const char **argv, const char *prefix)if (!quiet)printf ("rm '%s'\n" , path); -if (remove_file_from_index (&the_index, path)) +if (remove_file_from_index (the_repository->index, path))die (_ ("git rm: unable to remove %s" ), path); }
@@ -432,10 +432,10 @@ int cmd_rm(int argc, const char **argv, const char *prefix) }strbuf_release (&buf);if (gitmodules_modified) -stage_updated_gitmodules (&the_index); +stage_updated_gitmodules (the_repository->index); } -if (write_locked_index (&the_index, &lock_file, +if (write_locked_index (the_repository->index, &lock_file,COMMIT_LOCK |SKIP_IF_UNCHANGED ))die (_ ("Unable to write new index file" ));
builtin/stash.c +22 -23
143 lines not on this page · raw message
builtin/submodule--helper.c +10 -11
@@ -1,4 +1,3 @@ -#define USE_THE_INDEX_VARIABLE #include "builtin.h" #include "abspath.h" #include "environment.h"
@@ -207,18 +206,18 @@ static int module_list_compute(const char **argv,if (repo_read_index (the_repository) <0 )die (_ ("index file corrupt" )); -for (i =0 ; i < the_index.cache_nr; i++) { -const struct cache_entry *ce = the_index.cache[i]; +for (i =0 ; i < the_repository->index->cache_nr; i++) { +const struct cache_entry *ce = the_repository->index->cache[i]; -if (!match_pathspec (&the_index, pathspec, ce->name,ce_namelen (ce), +if (!match_pathspec (the_repository->index, pathspec, ce->name,ce_namelen (ce),0 , ps_matched,1 ) || !S_ISGITLINK (ce->ce_mode))continue ;ALLOC_GROW (list->entries, list->nr +1 , list->alloc); list->entries[list->nr++] = ce; -while (i +1 < the_index.cache_nr && - !strcmp (ce->name, the_index.cache[i +1 ]->name)) +while (i +1 < the_repository->index->cache_nr && + !strcmp (ce->name, the_repository->index->cache[i +1 ]->name))/* * Skip entries with the same name in different stages * to make sure an entry is returned only once.
@@ -907,7 +906,7 @@ static void generate_submodule_summary(struct summary_cb *info,int fd =open (p->sm_path,O_RDONLY );if (fd <0 ||fstat (fd, &st) <0 || -index_fd (&the_index, &p->oid_dst, fd, &st,OBJ_BLOB , +index_fd (the_repository->index, &p->oid_dst, fd, &st,OBJ_BLOB , p->sm_path,0 ))error (_ ("couldn't hash object from '%s'" ), p->sm_path); }else {
@@ -3243,21 +3242,21 @@ static void die_on_index_match(const char *path, int force)char *ps_matched =xcalloc (ps.nr,1 );/* TODO: audit for interaction with sparse-index. */ -ensure_full_index (&the_index); +ensure_full_index (the_repository->index);/* * Since there is only one pathspec, we just need to * check ps_matched[0] to know if a cache entry matched. */ -for (i =0 ; i < the_index.cache_nr; i++) { -ce_path_match (&the_index, the_index.cache[i], &ps, +for (i =0 ; i < the_repository->index->cache_nr; i++) { +ce_path_match (the_repository->index, the_repository->index->cache[i], &ps, ps_matched);if (ps_matched[0 ]) {if (!force)die (_ ("'%s' already exists in the index" ), path); -if (!S_ISGITLINK (the_index.cache[i]->ce_mode)) +if (!S_ISGITLINK (the_repository->index->cache[i]->ce_mode))die (_ ("'%s' already exists in the index " "and is not a submodule" ), path);break ;
builtin/update-index.c +61 -61
360 lines not on this page · raw message
builtin/write-tree.c +3 -3
@@ -3,7 +3,7 @@* * Copyright (C) Linus Torvalds, 2005 */ -#define USE_THE_INDEX_VARIABLE +#include "builtin.h" #include "config.h" #include "environment.h"
@@ -44,8 +44,8 @@ int cmd_write_tree(int argc, const char **argv, const char *cmd_prefix)prepare_repo_settings (the_repository); the_repository->settings.command_requires_full_index =0 ; - ret =write_index_as_tree (&oid, &the_index,get_index_file (), flags, - tree_prefix); + ret =write_index_as_tree (&oid, the_repository->index,get_index_file (), + flags, tree_prefix);switch (ret) {case 0 :printf ("%s\n" ,oid_to_hex (&oid));
Signature · 1 line
2.44.GIT
PATCH v2 3/6 repository: initialize index in `repo_init()`
In reply to Patrick SteinhardtWhen Git starts, one of the first things it will do is to call initialize_the_repository(). This function sets up both the global the_repository and the_index variables as required. Part of that setup is also to set the_repository.index = &the_index so that the index can be accessed via the repository.
When calling repo_init() on a repository though we set the complete struct to all-zeroes, which will also cause us to unset the index pointer. And as we don't re-initialize the index in that function, we will end up with a NULL pointer here.
This has been fine until now becaues this function is only used to create a new repository. git-init(1) does not access the index at all after initializing the repository, whereas git-checkout(1) only uses the_index directly. We are about to remove the_index though, which will uncover this partially-initialized repository structure.
Refactor the code and create a common initialize_repository() function that gets called from repo_init() and initialize_the_repository(). This function sets up both the repository and the index as required. Like this, we can easily special-case when repo_init() gets called with the_repository.
--- repository.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-)
repository.c +17 -11
@@ -25,17 +25,20 @@ static struct repository the_repo;struct repository *the_repository;struct index_state the_index; +static void initialize_repository (struct repository *repo, +struct index_state *index) +{ + repo->index = index; + repo->objects =raw_object_store_new (); + repo->remote_state =remote_state_new (); + repo->parsed_objects =parsed_object_pool_new (); +index_state_init (index, repo); +} +void initialize_the_repository (void ) { the_repository = &the_repo; - - the_repo.index = &the_index; - the_repo.objects =raw_object_store_new (); - the_repo.remote_state =remote_state_new (); - the_repo.parsed_objects =parsed_object_pool_new (); - -index_state_init (&the_index, the_repository); - +initialize_repository (the_repository, &the_index);repo_set_hash_algo (&the_repo,GIT_HASH_SHA1 ); }
@@ -188,9 +191,12 @@ int repo_init(struct repository *repo,struct repository_format format =REPOSITORY_FORMAT_INIT ;memset (repo,0 ,sizeof (*repo)); - repo->objects =raw_object_store_new (); - repo->parsed_objects =parsed_object_pool_new (); - repo->remote_state =remote_state_new (); +if (repo == the_repository) { +initialize_repository (the_repository, &the_index); + }else { +ALLOC_ARRAY (repo->index,1 ); +initialize_repository (repo, repo->index); + }if (repo_init_gitdir (repo, gitdir)) goto error;
Signature · 1 line
2.44.GIT
PATCH v2 4/6 builtin/clone: stop using `the_index`
In reply to Patrick SteinhardtConvert git-clone(1) to use the_repository->index instead of the_index.
--- builtin/clone.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
builtin/clone.c +3 -4
@@ -8,7 +8,6 @@* Clone a repository into a different directory that does not yet exist. */ -#define USE_THE_INDEX_VARIABLE #include "builtin.h" #include "abspath.h" #include "advice.h"
@@ -731,8 +730,8 @@ static int checkout(int submodule_progress, int filter_submodules) opts.preserve_ignored =0 ; opts.fn = oneway_merge; opts.verbose_update = (option_verbosity >=0 ); - opts.src_index = &the_index; - opts.dst_index = &the_index; + opts.src_index = the_repository->index; + opts.dst_index = the_repository->index;init_checkout_metadata (&opts.meta, head, &oid,NULL ); tree =parse_tree_indirect (&oid);
@@ -746,7 +745,7 @@ static int checkout(int submodule_progress, int filter_submodules)free (head); -if (write_locked_index (&the_index, &lock_file,COMMIT_LOCK )) +if (write_locked_index (the_repository->index, &lock_file,COMMIT_LOCK ))die (_ ("unable to write new index file" )); err |= run_hooks_l("post-checkout", oid_to_hex(null_oid()),
Signature · 1 line
2.44.GIT
PATCH v2 5/6 repository: drop `the_index` variable
In reply to Patrick SteinhardtAll users of the_index have been converted to use either a custom struct index_state * or the index provided by the_repository. We can thus drop the globally-accessible declaration of this variable. In fact, we can go further than that and drop the_index completely now and have it be allocated dynamically in initialize_repository() as all the other data structures in it are.
This concludes the quest to make Git the_index free, which has started with 4aab5b46f4 (Make read-cache.c "the_index" free., 2007-04-01).
--- repository.c | 25 ++++++------------------- repository.h | 3 --- 2 files changed, 6 insertions(+), 22 deletions(-)
repository.c +6 -19
@@ -1,8 +1,3 @@ -/* -* not really _using_ the compat macros, just make sure the_index -* declaration matches the definition in this file. -*/ -#define USE_THE_INDEX_VARIABLE #include "git-compat-util.h" #include "abspath.h" #include "repository.h"
@@ -23,22 +18,20 @@/* The main repository */ static struct repository the_repo;struct repository *the_repository; -struct index_state the_index; -static void initialize_repository (struct repository *repo, -struct index_state *index) +static void initialize_repository (struct repository *repo) { - repo->index = index; repo->objects =raw_object_store_new (); repo->remote_state =remote_state_new (); repo->parsed_objects =parsed_object_pool_new (); -index_state_init (index, repo); +ALLOC_ARRAY (repo->index,1 ); +index_state_init (repo->index, repo); }void initialize_the_repository (void ) { the_repository = &the_repo; -initialize_repository (the_repository, &the_index); +initialize_repository (the_repository);repo_set_hash_algo (&the_repo,GIT_HASH_SHA1 ); }
@@ -191,12 +184,7 @@ int repo_init(struct repository *repo,struct repository_format format =REPOSITORY_FORMAT_INIT ;memset (repo,0 ,sizeof (*repo)); -if (repo == the_repository) { -initialize_repository (the_repository, &the_index); - }else { -ALLOC_ARRAY (repo->index,1 ); -initialize_repository (repo, repo->index); - } +initialize_repository (repo);if (repo_init_gitdir (repo, gitdir)) goto error;
@@ -313,8 +301,7 @@ void repo_clear(struct repository *repo)if (repo->index) {discard_index (repo->index); -if (repo->index != &the_index) -FREE_AND_NULL (repo->index); +FREE_AND_NULL (repo->index); }if (repo->promisor_remote_config) {
repository.h +0 -3
@@ -187,9 +187,6 @@ struct repository { };extern struct repository *the_repository; -#ifdef USE_THE_INDEX_VARIABLE -extern struct index_state the_index; -#endif /* * Define a custom repository layout. Any field can be NULL, which
Signature · 1 line
2.44.GIT
PATCH v2 6/6 repository: drop `initialize_the_repository()`
In reply to Patrick SteinhardtNow that we have dropped the_index, initialize_the_repository() doesn't really do a lot anymore except for setting up the pointer for the_repository and then calling initialize_repository(). The former can be replaced by statically initializing the pointer though, which basically makes this function moot.
Convert callers to instead call initialize_repository(the_repository) and drop initialize_thee_repository().
--- common-main.c | 2 +- oss-fuzz/fuzz-commit-graph.c | 3 ++- repository.c | 29 +++++++++++++++++++++-------- repository.h | 2 +- t/helper/test-read-cache.c | 2 +- 5 files changed, 26 insertions(+), 12 deletions(-)
common-main.c +1 -1
@@ -48,7 +48,7 @@ int main(int argc, const char **argv)setlocale (LC_CTYPE ,"" );git_setup_gettext (); -initialize_the_repository (); +initialize_repository (the_repository);attr_start ();
oss-fuzz/fuzz-commit-graph.c +2 -1
@@ -11,7 +11,8 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {struct commit_graph *g; -initialize_the_repository (); +initialize_repository (the_repository); +/* * Initialize the_repository with commit-graph settings that would * normally be read from the repository's gitdir. We want to avoid
repository.c +21 -8
@@ -17,22 +17,35 @@/* The main repository */ static struct repository the_repo; -struct repository *the_repository; +struct repository *the_repository = &the_repo; -static void initialize_repository (struct repository *repo) +void initialize_repository (struct repository *repo) { repo->objects =raw_object_store_new (); repo->remote_state =remote_state_new (); repo->parsed_objects =parsed_object_pool_new ();ALLOC_ARRAY (repo->index,1 );index_state_init (repo->index, repo); -} -void initialize_the_repository (void ) -{ - the_repository = &the_repo; -initialize_repository (the_repository); -repo_set_hash_algo (&the_repo,GIT_HASH_SHA1 ); +/* +* Unfortunately, we need to keep this hack around for the time being: +* +* - Not setting up the hash algorithm for `the_repository` leads to +* crashes because `the_hash_algo` is a macro that expands to +* `the_repository->hash_algo`. So if Git commands try to access +* `the_hash_algo` without a Git directory we crash. +* +* - Setting up the hash algorithm to be SHA1 by default breaks other +* commands when running with SHA256. +* +* This is another point in case why having global state is a bad idea. +* Eventually, we should remove this hack and stop setting the hash +* algorithm in this function altogether. Instead, it should only ever +* be set via our repository setup procedures. But that requires more +* work. +*/ +if (repo == the_repository) +repo_set_hash_algo (repo,GIT_HASH_SHA1 ); } static void expand_base_dir(char **out, const char *in,
repository.h +1 -1
@@ -207,7 +207,7 @@ void repo_set_worktree(struct repository *repo, const char *path);void repo_set_hash_algo (struct repository *repo,int algo);void repo_set_compat_hash_algo (struct repository *repo,int compat_algo);void repo_set_ref_storage_format (struct repository *repo,unsigned int format); -void initialize_the_repository (void ); +void initialize_repository (struct repository *repo);RESULT_MUST_BE_USED int repo_init(struct repository *r, const char *gitdir, const char *worktree);
t/helper/test-read-cache.c +1 -1
@@ -9,7 +9,7 @@ int cmd__read_cache(int argc, const char **argv)int i, cnt =1 ;const char *name =NULL ; -initialize_the_repository (); +initialize_repository (the_repository);if (argc >1 &&skip_prefix (argv[1 ],"--print-and-refresh=" , &name)) { argc--;
Signature · 1 line
2.44.GIT
Re: [PATCH v2 0/6] global: drop `the_index` variable
In reply to Patrick SteinhardtQuoted 21 lines · Patrick Steinhardt
this is the second version of my patch series that aims to drop
the_index.Changes compared to v1:
- This version goes a bit further now and completely drops the static
the_indexvariable, as well. The repository's index gets allocated dynamically now, like all the other sub-structures like the ODB.- This also allows this series to remove
initialize_the_repository()now. Instead, callers callinitialize_repository()now.There is still quite an ugly hack in
initialize_repository()which requires us to treatthe_repositoryspecially. This is becausethe_hash_algomaps tothe_repository->hash_algo, and we rely on it being initialized to SHA1. So we need callrepo_set_hash_algo()onthe_repository. On the other hand, we cannot set the hash algo on repos which are notthe_repository, because that breaks stuff, as well.
Quoted 5 lines
I'm currently prepping another patch series that builds on top of this series and cleans up this mess. It surfaces several bugs that got masked by our setup, like for example
git rev-parse --short=not working correctly with SHA256 because we always truncate to the maximum length of SHA1.
I'll take a look, and may even comment on them later, but let me otherwise place this series on the back burner, not because I am in love with the_index (I am not) and not because I think the "index" member in the repository struct is a mistake (I suspect it is, but I am not convinced either way), but because I'd prefer to see our tree to be quiescent when we apply a tree-wide patch like [2/6], but we'll be in -rc period soonish, during which time we'd want to be able to concentrate on fixing regressions without having to worry about being able to reapply such tree-wide changes to keep 'next' and 'seen' building.
Thanks.
Re: [PATCH v2 0/6] global: drop `the_index` variable
Quoted 29 lines · Junio C Hamano
Quoted 21 lines · Patrick Steinhardt
this is the second version of my patch series that aims to drop
the_index.Changes compared to v1:
- This version goes a bit further now and completely drops the static
the_indexvariable, as well. The repository's index gets allocated dynamically now, like all the other sub-structures like the ODB.- This also allows this series to remove
initialize_the_repository()now. Instead, callers callinitialize_repository()now.There is still quite an ugly hack in
initialize_repository()which requires us to treatthe_repositoryspecially. This is becausethe_hash_algomaps tothe_repository->hash_algo, and we rely on it being initialized to SHA1. So we need callrepo_set_hash_algo()onthe_repository. On the other hand, we cannot set the hash algo on repos which are notthe_repository, because that breaks stuff, as well.Quoted 5 lines
I'm currently prepping another patch series that builds on top of this series and cleans up this mess. It surfaces several bugs that got masked by our setup, like for example
git rev-parse --short=not working correctly with SHA256 because we always truncate to the maximum length of SHA1.
Quoted 10 lines
I'll take a look, and may even comment on them later, but let me otherwise place this series on the back burner, not because I am in love with
the_index(I am not) and not because I think the "index" member in the repository struct is a mistake (I suspect it is, but I am not convinced either way), but because I'd prefer to see our tree to be quiescent when we apply a tree-wide patch like [2/6], but we'll be in -rc period soonish, during which time we'd want to be able to concentrate on fixing regressions without having to worry about being able to reapply such tree-wide changes to keep 'next' and 'seen' building.
Makes sense, thanks!
Patrick