v4 fixes some commit messages and killed a couple more the_index
references after I tried to merge this with 'pu'
diff --git a/apply.c b/apply.c
index 811ff2ad5e..82f681972f 100644
--- a/apply.c
+++ b/apply.c
@@ -4090,9 +4090,9 @@ static int build_fake_ancestor(struct apply_state *state, struct patch *list)
return error(_("sha1 information is lacking or useless "
"(%s)."), name);
- ce = make_cache_entry(&the_index, patch->old_mode, oid.hash, name, 0, 0);
+ ce = make_index_entry(&result, patch->old_mode, oid.hash, name, 0, 0);
if (!ce)
- return error(_("make_cache_entry failed for path '%s'"),
+ return error(_("make_index_entry failed for path '%s'"),
name);
if (add_index_entry(&result, ce, ADD_CACHE_OK_TO_ADD)) {
free(ce);
diff --git a/builtin/checkout.c b/builtin/checkout.c
index 3c8218304e..4dbcab3727 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -230,9 +230,9 @@ static int checkout_merged(int pos, const struct checkout *state)
if (write_object_file(result_buf.ptr, result_buf.size, blob_type, &oid))
die(_("Unable to add merge result for '%s'"), path);
free(result_buf.ptr);
- ce = make_cache_entry(&the_index, mode, oid.hash, path, 2, 0);
+ ce = make_index_entry(state->istate, mode, oid.hash, path, 2, 0);
if (!ce)
- die(_("make_cache_entry failed for path '%s'"), path);
+ die(_("make_index_entry failed for path '%s'"), path);
status = checkout_entry(ce, state, NULL);
free(ce);
return status;
diff --git a/builtin/difftool.c b/builtin/difftool.c
index e34e75a42d..c7d6296762 100644
--- a/builtin/difftool.c
+++ b/builtin/difftool.c
@@ -321,7 +321,7 @@ static int checkout_path(unsigned mode, struct object_id *oid,
struct cache_entry *ce;
int ret;
- ce = make_cache_entry(&the_index, mode, oid->hash, path, 0, 0);
+ ce = make_index_entry(state->istate, mode, oid->hash, path, 0, 0);
ret = checkout_entry(ce, state, NULL);
free(ce);
@@ -488,7 +488,7 @@ static int run_dir_diff(const char *extcmd, int symlinks, const char *prefix,
* index.
*/
struct cache_entry *ce2 =
- make_cache_entry(&the_index, rmode, roid.hash,
+ make_index_entry(&wtindex, rmode, roid.hash,
dst_path, 0, 0);
add_index_entry(&wtindex, ce2,
diff --git a/builtin/reset.c b/builtin/reset.c
index 0ea0a19d5e..067f535031 100644
--- a/builtin/reset.c
+++ b/builtin/reset.c
@@ -134,10 +134,10 @@ static void update_index_from_diff(struct diff_queue_struct *q,
continue;
}
- ce = make_cache_entry(&the_index, one->mode, one->oid.hash, one->path,
+ ce = make_index_entry(&the_index, one->mode, one->oid.hash, one->path,
0, 0);
if (!ce)
- die(_("make_cache_entry failed for path '%s'"),
+ die(_("make_index_entry failed for path '%s'"),
one->path);
if (is_missing) {
ce->ce_flags |= CE_INTENT_TO_ADD;
diff --git a/cache.h b/cache.h
index 242aaa5498..eb8c79b8a1 100644
--- a/cache.h
+++ b/cache.h
@@ -699,7 +699,7 @@ extern int remove_file_from_index(struct index_state *, const char *path);
extern int add_to_index(struct index_state *, const char *path, struct stat *, int flags);
extern int add_file_to_index(struct index_state *, const char *path, int flags);
-extern struct cache_entry *make_cache_entry(struct index_state *istate,unsigned int mode, const unsigned char *sha1, const char *path, int stage, unsigned int refresh_options);
+extern struct cache_entry *make_index_entry(struct index_state *istate, unsigned int mode, const unsigned char *sha1, const char *path, int stage, unsigned int refresh_options);
extern int chmod_index_entry(struct index_state *, struct cache_entry *ce, char flip);
extern int ce_same_name(const struct cache_entry *a, const struct cache_entry *b);
extern void set_object_name_for_intent_to_add_entry(struct cache_entry *ce);
diff --git a/merge-recursive.c b/merge-recursive.c
index 9280deb6a1..4f054d6dbb 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -315,7 +315,7 @@ static int add_cacheinfo(struct merge_options *o,
struct cache_entry *ce;
int ret;
- ce = make_cache_entry(&the_index, mode, oid ? oid->hash : null_sha1, path, stage, 0);
+ ce = make_index_entry(&the_index, mode, oid ? oid->hash : null_sha1, path, stage, 0);
if (!ce)
return err(o, _("add_cacheinfo failed for path '%s'; merge aborting."), path);
diff --git a/read-cache.c b/read-cache.c
index c083318aa7..4352aac521 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -745,7 +745,7 @@ int add_file_to_index(struct index_state *istate, const char *path, int flags)
return add_to_index(istate, path, &st, flags);
}
-struct cache_entry *make_cache_entry(struct index_state *istate,
+struct cache_entry *make_index_entry(struct index_state *istate,
unsigned int mode,
const unsigned char *sha1,
const char *path, int stage,
diff --git a/resolve-undo.c b/resolve-undo.c
index a4918546c3..2377995d6d 100644
--- a/resolve-undo.c
+++ b/resolve-undo.c
@@ -147,7 +147,7 @@ int unmerge_index_entry_at(struct index_state *istate, int pos)
struct cache_entry *nce;
if (!ru->mode[i])
continue;
- nce = make_cache_entry(istate, ru->mode[i], ru->oid[i].hash,
+ nce = make_index_entry(istate, ru->mode[i], ru->oid[i].hash,
name, i + 1, 0);
if (matched)
nce->ce_flags |= CE_MATCHED;
Nguyễn Thái Ngọc Duy (23):
unpack-trees: remove 'extern' on function declaration
unpack-trees: add a note about path invalidation
unpack-trees: don't shadow global var the_index
unpack-tress: convert clear_ce_flags* to avoid the_index
unpack-trees: avoid the_index in verify_absent()
attr.h: drop extern from function declaration
attr: remove an implicit dependency on the_index
convert.h: drop 'extern' from function declaration
convert.c: remove an implicit dependency on the_index
dir.c: remove an implicit dependency on the_index in pathspec code
ls-files: correct index argument to get_convert_attr_ascii()
pathspec.c: use the right index instead of the_index
submodule.c: use the right index instead of the_index
entry.c: use the right index instead of the_index
attr: remove index from git_attr_set_direction()
preload-index.c: use the right index instead of the_index
read-cache.c: remove an implicit dependency on the_index
apply.c: use the right index instead of the_index
difftool: use the right index instead of the_index
checkout: avoid the_index when possible
resolve-undo.c: use the right index instead of the_index
grep: use the right index instead of the_index
cache.h: make the_index part of "compatibility macros"
apply.c | 6 ++--
archive.c | 8 ++---
attr.c | 52 ++++++++++++++++++-------------
attr.h | 31 ++++++++++---------
builtin/add.c | 6 ++--
builtin/cat-file.c | 2 +-
builtin/check-attr.c | 6 ++--
builtin/checkout-index.c | 1 +
builtin/checkout.c | 6 ++--
builtin/clean.c | 2 +-
builtin/commit.c | 2 +-
builtin/difftool.c | 4 +--
builtin/grep.c | 6 ++--
builtin/ls-files.c | 17 ++++++-----
builtin/pack-objects.c | 2 +-
builtin/reset.c | 4 +--
builtin/rm.c | 2 +-
builtin/submodule--helper.c | 2 +-
builtin/update-index.c | 2 +-
cache.h | 9 +++---
convert.c | 41 ++++++++++++++-----------
convert.h | 61 +++++++++++++++++++++----------------
diff-lib.c | 4 +--
diff.c | 2 +-
dir.c | 27 +++++++++-------
dir.h | 16 ++++++----
entry.c | 10 +++---
ll-merge.c | 4 +--
merge-recursive.c | 4 +--
pathspec.c | 2 +-
preload-index.c | 3 +-
read-cache.c | 19 +++++++-----
rerere.c | 2 +-
resolve-undo.c | 5 +--
revision.c | 2 +-
sha1-file.c | 4 +--
submodule.c | 8 ++---
unpack-trees.c | 57 +++++++++++++++++++++-------------
unpack-trees.h | 4 +--
userdiff.c | 2 +-
ws.c | 2 +-
wt-status.c | 6 ++--
42 files changed, 258 insertions(+), 197 deletions(-)
--
2.18.0.rc0.333.g22e6ee6cdf
