From: Derrick Stolee <dstolee@xxxxxxxxxxxxx>
This is a mechanical replacement of remove_file_from_cache().
Signed-off-by: Derrick Stolee <dstolee@xxxxxxxxxxxxx>
---
builtin/update-index.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/builtin/update-index.c b/builtin/update-index.c
index a24b1fc90e4..87fbc580032 100644
--- a/builtin/update-index.c
+++ b/builtin/update-index.c
@@ -251,7 +251,7 @@ static int remove_one_path(const char *path)
{
if (!allow_remove)
return error("%s: does not exist and --remove not passed", path);
- if (remove_file_from_cache(path))
+ if (remove_file_from_index(istate, path))
return error("%s: cannot remove from the index", path);
return 0;
}
@@ -385,7 +385,7 @@ static int process_path(const char *path, struct stat *st, int stat_errno)
* On the other hand, removing it from index should work
*/
if (!ignore_skip_worktree_entries && allow_remove &&
- remove_file_from_cache(path))
+ remove_file_from_index(istate, path))
return error("%s: cannot remove from the index", path);
return 0;
}
@@ -472,7 +472,7 @@ static void update_one(const char *path)
}
if (force_remove) {
- if (remove_file_from_cache(path))
+ if (remove_file_from_index(istate, path))
die("git update-index: unable to remove %s", path);
report("remove '%s'", path);
return;
@@ -555,7 +555,7 @@ static void read_index_info(int nul_term_line)
if (!mode) {
/* mode == 0 means there is no such path -- remove */
- if (remove_file_from_cache(path_name))
+ if (remove_file_from_index(istate, path_name))
die("git update-index: unable to remove %s",
ptr);
}
@@ -671,7 +671,7 @@ static int unresolve_one(const char *path)
goto free_return;
}
- remove_file_from_cache(path);
+ remove_file_from_index(repo->index, path);
if (add_cache_entry(ce_2, ADD_CACHE_OK_TO_ADD)) {
error("%s: cannot add our version to the index.", path);
ret = -1;
--
gitgitgadget
