Signed-off-by: Stefan Beller <sbel...@google.com> --- cache.h | 1 - rerere.c | 2 +- submodule.c | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/cache.h b/cache.h index bc49defc27..a9b059913e 100644 --- a/cache.h +++ b/cache.h @@ -354,7 +354,6 @@ extern void free_name_hash(struct index_state *istate); #ifndef NO_THE_INDEX_COMPATIBILITY_MACROS -#define add_file_to_cache(path, flags) add_file_to_index(&the_index, (path), (flags)) #define chmod_cache_entry(ce, flip) chmod_index_entry(&the_index, (ce), (flip)) #define refresh_cache(flags) refresh_index(&the_index, (flags), NULL, NULL, NULL) #define ce_match_stat(ce, st, options) ie_match_stat(&the_index, (ce), (st), (options)) diff --git a/rerere.c b/rerere.c index b6d84b8461..0ada0ef247 100644 --- a/rerere.c +++ b/rerere.c @@ -712,7 +712,7 @@ static void update_paths(struct string_list *update) for (i = 0; i < update->nr; i++) { struct string_list_item *item = &update->items[i]; - if (add_file_to_cache(item->string, 0)) + if (add_file_to_index(&the_index, item->string, 0)) exit(128); fprintf(stderr, "Staged '%s' using previous resolution.\n", item->string); diff --git a/submodule.c b/submodule.c index 148194831d..6587bc0d84 100644 --- a/submodule.c +++ b/submodule.c @@ -119,7 +119,7 @@ int remove_path_from_gitmodules(const char *path) void stage_updated_gitmodules(void) { - if (add_file_to_cache(".gitmodules", 0)) + if (add_file_to_index(&the_index, ".gitmodules", 0)) die(_("staging updated .gitmodules failed")); } -- 2.13.0.rc1.39.ga6db8bfa24