diff options
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/add.c | 5 | ||||
| -rw-r--r-- | builtin/am.c | 4 | ||||
| -rw-r--r-- | builtin/checkout.c | 4 | ||||
| -rw-r--r-- | builtin/clean.c | 2 | ||||
| -rw-r--r-- | builtin/commit.c | 2 | ||||
| -rw-r--r-- | builtin/merge.c | 2 | ||||
| -rw-r--r-- | builtin/mv.c | 4 | ||||
| -rw-r--r-- | builtin/pull.c | 4 | ||||
| -rw-r--r-- | builtin/read-tree.c | 4 | ||||
| -rw-r--r-- | builtin/reset.c | 4 | ||||
| -rw-r--r-- | builtin/update-index.c | 4 |
11 files changed, 20 insertions, 19 deletions
diff --git a/builtin/add.c b/builtin/add.c index 626c71ec6a..75be1d021a 100644 --- a/builtin/add.c +++ b/builtin/add.c @@ -55,7 +55,7 @@ static int chmod_pathspec(struct pathspec *pathspec, char flip, int show_only) continue; if (!show_only) - err = chmod_cache_entry(ce, flip); + err = chmod_index_entry(&the_index, ce, flip); else err = S_ISREG(ce->ce_mode) ? 0 : -1; @@ -172,7 +172,8 @@ static int renormalize_tracked_files(const struct pathspec *pathspec, int flags) continue; /* do not touch non blobs */ if (pathspec && !ce_path_match(&the_index, ce, pathspec, NULL)) continue; - retval |= add_file_to_cache(ce->name, flags | ADD_CACHE_RENORMALIZE); + retval |= add_file_to_index(&the_index, ce->name, + flags | ADD_CACHE_RENORMALIZE); } return retval; diff --git a/builtin/am.c b/builtin/am.c index 20aea0d248..f362a1c29f 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -1930,7 +1930,7 @@ static void am_resolve(struct am_state *state, int allow_empty) } } - if (unmerged_cache()) { + if (unmerged_index(&the_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.")); @@ -2045,7 +2045,7 @@ static int clean_index(const struct object_id *head, const struct object_id *rem if (!remote_tree) return error(_("Could not parse object '%s'."), oid_to_hex(remote)); - read_cache_unmerged(); + repo_read_index_unmerged(the_repository); if (fast_forward_to(head_tree, head_tree, 1)) return -1; diff --git a/builtin/checkout.c b/builtin/checkout.c index 2a132392fb..aa610b274e 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -722,7 +722,7 @@ static void init_topts(struct unpack_trees_options *topts, int merge, setup_unpack_trees_porcelain(topts, "checkout"); - topts->initial_checkout = is_cache_unborn(); + topts->initial_checkout = is_index_unborn(&the_index); topts->update = 1; topts->merge = 1; topts->quiet = merge && old_commit; @@ -763,7 +763,7 @@ static int merge_working_tree(const struct checkout_opts *opts, refresh_cache(REFRESH_QUIET); - if (unmerged_cache()) { + if (unmerged_index(&the_index)) { error(_("you need to resolve your current index first")); return 1; } diff --git a/builtin/clean.c b/builtin/clean.c index 40ff2c578d..7084e685f6 100644 --- a/builtin/clean.c +++ b/builtin/clean.c @@ -1031,7 +1031,7 @@ int cmd_clean(int argc, const char **argv, const char *prefix) struct stat st; const char *rel; - if (!cache_name_is_other(ent->name, ent->len)) + if (!index_name_is_other(&the_index, ent->name, ent->len)) continue; if (lstat(ent->name, &st)) diff --git a/builtin/commit.c b/builtin/commit.c index e22bdf23f5..985503d43a 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -302,7 +302,7 @@ static void add_remove_files(struct string_list *list) continue; if (!lstat(p->string, &st)) { - if (add_to_cache(p->string, &st, 0)) + if (add_to_index(&the_index, p->string, &st, 0)) die(_("updating files failed")); } else remove_file_from_cache(p->string); diff --git a/builtin/merge.c b/builtin/merge.c index b3f75f55c8..da11dfae19 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -1375,7 +1375,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix) goto done; } - if (read_cache_unmerged()) + if (repo_read_index_unmerged(the_repository)) die_resolve_conflict("merge"); if (file_exists(git_path_merge_head(the_repository))) { diff --git a/builtin/mv.c b/builtin/mv.c index 3413ad1c9b..df6157fd6b 100644 --- a/builtin/mv.c +++ b/builtin/mv.c @@ -343,7 +343,7 @@ dir_check: argc += last - first; goto act_on_entry; } - if (!(ce = cache_file_exists(src, length, 0))) { + if (!(ce = index_file_exists(&the_index, src, length, 0))) { bad = _("not under version control"); goto act_on_entry; } @@ -472,7 +472,7 @@ remove_entry: assert(pos >= 0); if (!(mode & SPARSE) && !lstat(src, &st)) sparse_and_dirty = ce_modified(active_cache[pos], &st, 0); - rename_cache_entry_at(pos, dst); + rename_index_entry_at(&the_index, pos, dst); if (ignore_sparse && core_apply_sparse_checkout && diff --git a/builtin/pull.c b/builtin/pull.c index b21edd767a..4a2a6db2dc 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -1030,7 +1030,7 @@ int cmd_pull(int argc, const char **argv, const char *prefix) if (opt_rebase < 0) opt_rebase = config_get_rebase(&rebase_unspecified); - if (read_cache_unmerged()) + if (repo_read_index_unmerged(the_repository)) die_resolve_conflict("pull"); if (file_exists(git_path_merge_head(the_repository))) @@ -1043,7 +1043,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_cache_unborn()) + if (is_null_oid(&orig_head) && !is_index_unborn(&the_index)) die(_("Updating an unborn branch with changes added to the index.")); if (!opt_autostash) diff --git a/builtin/read-tree.c b/builtin/read-tree.c index 45c6652444..fd70827310 100644 --- a/builtin/read-tree.c +++ b/builtin/read-tree.c @@ -188,7 +188,7 @@ int cmd_read_tree(int argc, const char **argv, const char *cmd_prefix) */ if (opts.reset || opts.merge || opts.prefix) { - if (read_cache_unmerged() && (opts.prefix || opts.merge)) + if (repo_read_index_unmerged(the_repository) && (opts.prefix || opts.merge)) die(_("You need to resolve your current index first")); stage = opts.merge = 1; } @@ -232,7 +232,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_cache_unborn(); + opts.initial_checkout = is_index_unborn(&the_index); break; case 3: default: diff --git a/builtin/reset.c b/builtin/reset.c index ab02777482..e561180e8c 100644 --- a/builtin/reset.c +++ b/builtin/reset.c @@ -84,7 +84,7 @@ static int reset_index(const char *ref, const struct object_id *oid, int reset_t BUG("invalid reset_type passed to reset_index"); } - read_cache_unmerged(); + repo_read_index_unmerged(the_repository); if (reset_type == KEEP) { struct object_id head_oid; @@ -220,7 +220,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_cache()) + if (is_merge() || unmerged_index(&the_index)) die(_("Cannot do a %s reset in the middle of a merge."), _(reset_type_names[reset_type])); diff --git a/builtin/update-index.c b/builtin/update-index.c index 7b0c924d7d..e1b2bb78e7 100644 --- a/builtin/update-index.c +++ b/builtin/update-index.c @@ -445,7 +445,7 @@ static void chmod_path(char flip, const char *path) if (pos < 0) goto fail; ce = active_cache[pos]; - if (chmod_cache_entry(ce, flip) < 0) + if (chmod_index_entry(&the_index, ce, flip) < 0) goto fail; report("chmod %cx '%s'", flip, path); @@ -641,7 +641,7 @@ static int unresolve_one(const char *path) pos = cache_name_pos(path, namelen); if (0 <= pos) { /* already merged */ - pos = unmerge_cache_entry_at(pos); + pos = unmerge_index_entry_at(&the_index, pos); if (pos < active_nr) { const struct cache_entry *ce = active_cache[pos]; if (ce_stage(ce) && |