kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

read-cache: add remove_file_from_index_with_flags() 

add_file_to_index() takes flags such as ADD_CACHE_PRETEND and
ADD_CACHE_VERBOSE and internally handles both reporting (e.g.,
"add 'path'") and suppressing index updates during dry runs.

In contrast, remove_file_from_index() takes only istate and path
without flags.  Callers that perform file removals (such as
update_callback() in read-cache.c) are forced to manually inspect
ADD_CACHE_PRETEND and ADD_CACHE_VERBOSE flags for removed
files.

Introduce remove_file_from_index_with_flags() to encapsulate
pretend mode and verbose reporting for index removals.  Update
update_callback() to use the new helper.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
main
Junio C Hamano 2026-07-31 05:56:04 -07:00
parent e28c701fe4
commit 341ce9229e
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
read-cache-ll.h
View File

@ -391,11 +391,14 @@ int remove_index_entry_at(struct index_state *, int pos);


void remove_marked_cache_entries(struct index_state *istate, int invalidate); void remove_marked_cache_entries(struct index_state *istate, int invalidate);
int remove_file_from_index(struct index_state *, const char *path); int remove_file_from_index(struct index_state *, const char *path);
int remove_file_from_index_with_flags(struct index_state *, const char *, int);

#define ADD_CACHE_VERBOSE 1 #define ADD_CACHE_VERBOSE 1
#define ADD_CACHE_PRETEND 2 #define ADD_CACHE_PRETEND 2
#define ADD_CACHE_IGNORE_ERRORS 4 #define ADD_CACHE_IGNORE_ERRORS 4
#define ADD_CACHE_IGNORE_REMOVAL 8 #define ADD_CACHE_IGNORE_REMOVAL 8
#define ADD_CACHE_INTENT 16 #define ADD_CACHE_INTENT 16

/* /*
* These two are used to add the contents of the file at path * These two are used to add the contents of the file at path
* to the index, marking the working tree up-to-date by storing * to the index, marking the working tree up-to-date by storing

19
read-cache.c
View File

@ -638,6 +638,20 @@ int remove_file_from_index(struct index_state *istate, const char *path)
return 0; return 0;
} }


int remove_file_from_index_with_flags(struct index_state *istate,
const char *path,
int flags)
{
int verbose = flags & (ADD_CACHE_VERBOSE | ADD_CACHE_PRETEND);
int pretend = flags & ADD_CACHE_PRETEND;

if (verbose)
printf(_("remove '%s'\n"), path);
if (pretend)
return 0;
return remove_file_from_index(istate, path);
}

static int compare_name(struct cache_entry *ce, const char *path, int namelen) static int compare_name(struct cache_entry *ce, const char *path, int namelen)
{ {
return namelen != ce_namelen(ce) || memcmp(path, ce->name, namelen); return namelen != ce_namelen(ce) || memcmp(path, ce->name, namelen);
@ -4004,10 +4018,7 @@ static void update_callback(struct diff_queue_struct *q,
case DIFF_STATUS_DELETED: case DIFF_STATUS_DELETED:
if (data->flags & ADD_CACHE_IGNORE_REMOVAL) if (data->flags & ADD_CACHE_IGNORE_REMOVAL)
break; break;
if (!(data->flags & ADD_CACHE_PRETEND)) remove_file_from_index_with_flags(data->index, path, data->flags);
remove_file_from_index(data->index, path);
if (data->flags & (ADD_CACHE_PRETEND|ADD_CACHE_VERBOSE))
printf(_("remove '%s'\n"), path);
break; break;
} }
} }