[PATCH v2 00/11] Remove the_index, the final part
To
git@vger.kernel.org
Cc
Martin Ågren
Nguyễn Thái Ngọc Duy
From
Nguyễn Thái Ngọc Duy
See Also
Prev
Date
2019-01-12 02:13:21 UTC
v2 fixes Martin's comment in 2/10 and also includes a new patch about
grep_opt->repo that was sent and reviewed during rc time [1]. It's kind
of the same topic so I include it here instead of resending it
separately.

[1] https://public-inbox.org/git/20181118163851.32178-1-pclouds@gmail.com/

Range-diff:

 -:  ---------- >  1:  2e43d9479e grep: use grep_opt->repo instead of explict repo argument
 1:  5e2b073fcc =  2:  f6eeeba0e7 notes-utils.c: remove the_repository references
 2:  7055e1e351 !  3:  1fca26dc83 repository.c: replace hold_locked_index() with repo_hold_locked_index()
    @@ -23,18 +23,6 @@
      
      	if (state->check_index && read_apply_cache(state) < 0) {
     
    - diff --git a/builtin/clone.c b/builtin/clone.c
    - --- a/builtin/clone.c
    - +++ b/builtin/clone.c
    -@@
    -  * Clone a repository into a different directory that does not yet exist.
    -  */
    - 
    -+#define USE_THE_INDEX_COMPATIBILITY_MACROS
    - #include "builtin.h"
    - #include "config.h"
    - #include "lockfile.h"
    -
      diff --git a/cache.h b/cache.h
      --- a/cache.h
      +++ b/cache.h
    @@ -117,6 +105,8 @@
     +			   struct lock_file *lf,
     +			   int flags)
     +{
    ++	if (!repo->index_file)
    ++		BUG("the repo hasn't been setup");
     +	return hold_lock_file_for_update(lf, repo->index_file, flags);
     +}
     
 3:  86d6231d9e =  4:  4f63b505d7 checkout: avoid the_index when possible
 4:  50b7828c17 =  5:  be722abc06 read-cache.c: kill read_index()
 5:  6cf6d66b97 =  6:  a86921c6b6 read-cache.c: replace update_index_if_able with repo_&
 6:  a5b19aac6d =  7:  637289c4ff sha1-name.c: remove implicit dependency on the_index
 7:  f9660a561e =  8:  f7fc854a43 merge-recursive.c: remove implicit dependency on the_index
 8:  be609ede73 =  9:  c1b37119a7 merge-recursive.c: remove implicit dependency on the_repository
 9:  639062ad41 = 10:  315f3f37d6 read-cache.c: remove the_* from index_has_changes()
10:  b41cebabad ! 11:  c271d734aa cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
    @@ -119,6 +119,18 @@
      #include "cache.h"
      #include "config.h"
     
    + diff --git a/builtin/clone.c b/builtin/clone.c
    + --- a/builtin/clone.c
    + +++ b/builtin/clone.c
    +@@
    +  * Clone a repository into a different directory that does not yet exist.
    +  */
    + 
    ++#define USE_THE_INDEX_COMPATIBILITY_MACROS
    + #include "builtin.h"
    + #include "config.h"
    + #include "lockfile.h"
    +
      diff --git a/builtin/commit.c b/builtin/commit.c
      --- a/builtin/commit.c
      +++ b/builtin/commit.c

Nguyễn Thái Ngọc Duy (11):
  grep: use grep_opt->repo instead of explict repo argument
  notes-utils.c: remove the_repository references
  repository.c: replace hold_locked_index() with
    repo_hold_locked_index()
  checkout: avoid the_index when possible
  read-cache.c: kill read_index()
  read-cache.c: replace update_index_if_able with repo_&
  sha1-name.c: remove implicit dependency on the_index
  merge-recursive.c: remove implicit dependency on the_index
  merge-recursive.c: remove implicit dependency on the_repository
  read-cache.c: remove the_* from index_has_changes()
  cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch

 apply.c                              |   5 +-
 attr.c                               |   1 -
 blame.c                              |   4 +-
 builtin/add.c                        |   1 +
 builtin/am.c                         |  13 +-
 builtin/blame.c                      |   3 +-
 builtin/cat-file.c                   |   7 +-
 builtin/check-attr.c                 |   1 +
 builtin/check-ignore.c               |   1 +
 builtin/checkout-index.c             |   1 +
 builtin/checkout.c                   |   5 +-
 builtin/clean.c                      |   1 +
 builtin/clone.c                      |   1 +
 builtin/commit.c                     |   7 +-
 builtin/describe.c                   |   3 +-
 builtin/diff-files.c                 |   1 +
 builtin/diff-index.c                 |   1 +
 builtin/diff-tree.c                  |   3 +-
 builtin/diff.c                       |   3 +-
 builtin/difftool.c                   |   1 +
 builtin/fsck.c                       |   1 +
 builtin/grep.c                       |  45 ++++---
 builtin/hash-object.c                |   3 +-
 builtin/log.c                        |   4 +-
 builtin/ls-files.c                   |   1 -
 builtin/merge-index.c                |   1 +
 builtin/merge-ours.c                 |   1 +
 builtin/merge-recursive.c            |   2 +-
 builtin/merge-tree.c                 |   4 +-
 builtin/merge.c                      |   3 +-
 builtin/mv.c                         |   1 +
 builtin/notes.c                      |  21 +--
 builtin/pack-objects.c               |   2 +-
 builtin/pull.c                       |   1 +
 builtin/read-tree.c                  |   1 +
 builtin/rebase--interactive.c        |   1 +
 builtin/rebase.c                     |  14 +-
 builtin/replace.c                    |   2 +-
 builtin/reset.c                      |   1 +
 builtin/rev-parse.c                  |   4 +-
 builtin/rm.c                         |   1 +
 builtin/submodule--helper.c          |   1 +
 builtin/update-index.c               |   1 +
 builtin/write-tree.c                 |   1 +
 cache-tree.h                         |   2 +-
 cache.h                              |  35 ++---
 convert.c                            |   1 -
 dir.c                                |   1 -
 git.c                                |   4 +-
 list-objects-filter-options.c        |   2 +-
 merge-recursive.c                    | 191 +++++++++++++++------------
 merge-recursive.h                    |   6 +-
 merge.c                              |   4 +-
 name-hash.c                          |   1 -
 notes-merge.c                        |   4 +-
 notes-utils.c                        |  17 ++-
 notes-utils.h                        |  11 +-
 pathspec.c                           |   1 -
 preload-index.c                      |  11 +-
 read-cache.c                         |  44 +++---
 repository.c                         |  11 ++
 repository.h                         |  16 +++
 rerere.c                             |   8 +-
 revision.c                           |  12 +-
 sequencer.c                          |  41 +++---
 sequencer.h                          |   3 +-
 sha1-name.c                          |  56 ++++----
 submodule.c                          |   1 -
 t/helper/test-dump-fsmonitor.c       |   4 +-
 t/helper/test-dump-untracked-cache.c |   1 +
 t/helper/test-tool.h                 |   1 +
 tree.c                               |   1 -
 unpack-trees.c                       |   1 -
 wt-status.c                          |   4 +-
 74 files changed, 385 insertions(+), 290 deletions(-)

-- 
2.20.0.482.g66447595a7