Merge branch 'nd/no-the-index'
authorJunio C Hamano <gitster@pobox.com>
Mon, 20 Aug 2018 18:33:53 +0000 (11:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 20 Aug 2018 18:33:53 +0000 (11:33 -0700)
The more library-ish parts of the codebase learned to work on the
in-core index-state instance that is passed in by their callers,
instead of always working on the singleton "the_index" instance.

* nd/no-the-index: (24 commits)
  blame.c: remove implicit dependency on the_index
  apply.c: remove implicit dependency on the_index
  apply.c: make init_apply_state() take a struct repository
  apply.c: pass struct apply_state to more functions
  resolve-undo.c: use the right index instead of the_index
  archive-*.c: use the right repository
  archive.c: avoid access to the_index
  grep: use the right index instead of the_index
  attr: remove index from git_attr_set_direction()
  entry.c: use the right index instead of the_index
  submodule.c: use the right index instead of the_index
  pathspec.c: use the right index instead of the_index
  unpack-trees: avoid the_index in verify_absent()
  unpack-trees: convert clear_ce_flags* to avoid the_index
  unpack-trees: don't shadow global var the_index
  unpack-trees: add a note about path invalidation
  unpack-trees: remove 'extern' on function declaration
  ls-files: correct index argument to get_convert_attr_ascii()
  preload-index.c: use the right index instead of the_index
  dir.c: remove an implicit dependency on the_index in pathspec code
  ...

18 files changed:
1  2 
archive-tar.c
archive-zip.c
builtin/add.c
builtin/blame.c
builtin/cat-file.c
builtin/checkout.c
builtin/commit.c
builtin/grep.c
builtin/pack-objects.c
builtin/rm.c
builtin/update-index.c
convert.c
diff.c
dir.c
merge-recursive.c
read-cache.c
sequencer.c
sha1-file.c

diff --cc archive-tar.c
Simple merge
diff --cc archive-zip.c
Simple merge
diff --cc builtin/add.c
Simple merge
diff --cc builtin/blame.c
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc builtin/grep.c
Simple merge
Simple merge
diff --cc builtin/rm.c
Simple merge
Simple merge
diff --cc convert.c
Simple merge
diff --cc diff.c
Simple merge
diff --cc dir.c
Simple merge
Simple merge
diff --cc read-cache.c
Simple merge
diff --cc sequencer.c
Simple merge
diff --cc sha1-file.c
Simple merge