cocci & cache.h: apply pending "index_cache_pos" rule

[thirdparty/git.git] / builtin / mv.c

diff --git a/builtin/mv.c b/builtin/mv.c
index 19790ce38fa265d1b2b02f738ad6351492752e10..edd7b931fdb95f84eec899acbf0b4ae2a120f2d7 100644 (file)
--- a/builtin/mv.c
+++ b/builtin/mv.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2006 Johannes Schindelin
  */
-#define USE_THE_INDEX_COMPATIBILITY_MACROS
+#define USE_THE_INDEX_VARIABLE
 #include "builtin.h"
 #include "config.h"
 #include "pathspec.h"
@@ -489,7 +489,8 @@ remove_entry:
                        if ((mode & SPARSE) &&
                            path_in_sparse_checkout(dst, &the_index)) {
                                /* from out-of-cone to in-cone */
-                               int dst_pos = cache_name_pos(dst, strlen(dst));
+                               int dst_pos = index_name_pos(&the_index, dst,
+                                                            strlen(dst));
                                struct cache_entry *dst_ce = the_index.cache[dst_pos];
 
                                dst_ce->ce_flags &= ~CE_SKIP_WORKTREE;
@@ -500,7 +501,8 @@ remove_entry:
                                   !(mode & SPARSE) &&
                                   !path_in_sparse_checkout(dst, &the_index)) {
                                /* from in-cone to out-of-cone */
-                               int dst_pos = cache_name_pos(dst, strlen(dst));
+                               int dst_pos = index_name_pos(&the_index, dst,
+                                                            strlen(dst));
                                struct cache_entry *dst_ce = the_index.cache[dst_pos];
 
                                /*