Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
cache.h: document remove_index_entry_at
author
Stefan Beller
<sbeller@google.com>
Thu, 19 Jan 2017 03:18:52 +0000
(19:18 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Thu, 19 Jan 2017 20:17:57 +0000
(12:17 -0800)
Do this by moving the existing documentation from
read-cache.c to cache.h.
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
cache.h
patch
|
blob
|
history
read-cache.c
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (from parent 1:
12733e9
)
diff --git
a/cache.h
b/cache.h
index 83c8c260cea5aeb9d25f716a7b0c754323ff4d96..c8b881a908afa03a6afac29df1c566bb8da23490 100644
(file)
--- a/
cache.h
+++ b/
cache.h
@@
-603,7
+603,10
@@
extern int index_name_pos(const struct index_state *, const char *name, int name
#define ADD_CACHE_KEEP_CACHE_TREE 32 /* Do not invalidate cache-tree */
extern int add_index_entry(struct index_state *, struct cache_entry *ce, int option);
extern void rename_index_entry_at(struct index_state *, int pos, const char *new_name);
#define ADD_CACHE_KEEP_CACHE_TREE 32 /* Do not invalidate cache-tree */
extern int add_index_entry(struct index_state *, struct cache_entry *ce, int option);
extern void rename_index_entry_at(struct index_state *, int pos, const char *new_name);
+
+/* Remove entry, return true if there are more entries to go. */
extern int remove_index_entry_at(struct index_state *, int pos);
extern int remove_index_entry_at(struct index_state *, int pos);
+
extern void remove_marked_cache_entries(struct index_state *istate);
extern int remove_file_from_index(struct index_state *, const char *path);
#define ADD_CACHE_VERBOSE 1
extern void remove_marked_cache_entries(struct index_state *istate);
extern int remove_file_from_index(struct index_state *, const char *path);
#define ADD_CACHE_VERBOSE 1
diff --git
a/read-cache.c
b/read-cache.c
index db5d910642663e73e4e4fc8d91e0caba4445bdb1..585ff02dc3307daf1959867183b1beed0917fb0b 100644
(file)
--- a/
read-cache.c
+++ b/
read-cache.c
@@
-510,7
+510,6
@@
int index_name_pos(const struct index_state *istate, const char *name, int namel
return index_name_stage_pos(istate, name, namelen, 0);
}
return index_name_stage_pos(istate, name, namelen, 0);
}
-/* Remove entry, return true if there are more entries to go.. */
int remove_index_entry_at(struct index_state *istate, int pos)
{
struct cache_entry *ce = istate->cache[pos];
int remove_index_entry_at(struct index_state *istate, int pos)
{
struct cache_entry *ce = istate->cache[pos];