[PATCH 08/24] cache.h: drop unmerge_cache[_entry_at]

[Stefan Beller]

Signed-off-by: Stefan Beller <sbel...@google.com>
---
 builtin/update-index.c | 2 +-
 cache.h                | 2 --
 rerere.c               | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/builtin/update-index.c b/builtin/update-index.c
index 8667c48446..b8458016f0 100644
--- a/builtin/update-index.c
+++ b/builtin/update-index.c
@@ -613,7 +613,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 < the_index.cache_nr) {
                        const struct cache_entry *ce = the_index.cache[pos];
                        if (ce_stage(ce) &&
diff --git a/cache.h b/cache.h
index d078e88c3f..8a2dc393dc 100644
--- a/cache.h
+++ b/cache.h
@@ -372,8 +372,6 @@ extern void free_name_hash(struct index_state *istate);
 #define cache_file_exists(name, namelen, igncase) 
index_file_exists(&the_index, (name), (namelen), (igncase))
 #define cache_name_is_other(name, namelen) index_name_is_other(&the_index, 
(name), (namelen))
 #define resolve_undo_clear() resolve_undo_clear_index(&the_index)
-#define unmerge_cache_entry_at(at) unmerge_index_entry_at(&the_index, at)
-#define unmerge_cache(pathspec) unmerge_index(&the_index, pathspec)
 #endif
 
 enum object_type {
diff --git a/rerere.c b/rerere.c
index b9b39a959e..03218166ab 100644
--- a/rerere.c
+++ b/rerere.c
@@ -1116,7 +1116,7 @@ int rerere_forget(struct pathspec *pathspec)
         * recover the original conflicted state and then
         * find the conflicted paths.
         */
-       unmerge_cache(pathspec);
+       unmerge_index(&the_index, pathspec);
        find_conflict(&conflict);
        for (i = 0; i < conflict.nr; i++) {
                struct string_list_item *it = &conflict.items[i];
-- 
2.13.0.rc1.39.ga6db8bfa24