summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-04-02 05:14:40 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-04-05 22:07:16 (GMT)
commitfd1c3bf0533c6cc7e44646d4e52d378d5b5a1631 (patch)
treed24a361e357c81331a3544c2a742bef56a382d62
parent7da3bf372cfcd25ea44164afb90c306836b62e23 (diff)
downloadgit-fd1c3bf0533c6cc7e44646d4e52d378d5b5a1631.zip
git-fd1c3bf0533c6cc7e44646d4e52d378d5b5a1631.tar.gz
git-fd1c3bf0533c6cc7e44646d4e52d378d5b5a1631.tar.bz2
Rename add_file_to_index() to add_file_to_cache()
This function was not called "add_file_to_cache()" only because an ancient program, update-cache, used that name as an internal function name that does something slightly different. Now that is gone, we can take over the better name. The plan is to name all functions that operate on the default index xxx_cache(). Later patches create a variant of them that take an explicit parameter xxx_index(), and then turn xxx_cache() functions into macros that use "the_index". Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--builtin-add.c2
-rw-r--r--builtin-mv.c2
-rw-r--r--cache.h2
-rw-r--r--read-cache.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/builtin-add.c b/builtin-add.c
index 871e23f..7d1d5dc 100644
--- a/builtin-add.c
+++ b/builtin-add.c
@@ -205,7 +205,7 @@ int cmd_add(int argc, const char **argv, const char *prefix)
}
for (i = 0; i < dir.nr; i++)
- add_file_to_index(dir.entries[i]->name, verbose);
+ add_file_to_cache(dir.entries[i]->name, verbose);
if (active_cache_changed) {
if (write_cache(newfd, active_cache, active_nr) ||
diff --git a/builtin-mv.c b/builtin-mv.c
index 737af35..c4ab478 100644
--- a/builtin-mv.c
+++ b/builtin-mv.c
@@ -273,7 +273,7 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
for (i = 0; i < added.nr; i++) {
const char *path = added.items[i].path;
- add_file_to_index(path, verbose);
+ add_file_to_cache(path, verbose);
}
for (i = 0; i < deleted.nr; i++) {
diff --git a/cache.h b/cache.h
index 467e6a5..ece0c04 100644
--- a/cache.h
+++ b/cache.h
@@ -187,7 +187,7 @@ extern int add_cache_entry(struct cache_entry *ce, int option);
extern struct cache_entry *refresh_cache_entry(struct cache_entry *ce, int really);
extern int remove_cache_entry_at(int pos);
extern int remove_file_from_cache(const char *path);
-extern int add_file_to_index(const char *path, int verbose);
+extern int add_file_to_cache(const char *path, int verbose);
extern int ce_same_name(struct cache_entry *a, struct cache_entry *b);
extern int ce_match_stat(struct cache_entry *ce, struct stat *st, int);
extern int ce_modified(struct cache_entry *ce, struct stat *st, int);
diff --git a/read-cache.c b/read-cache.c
index 747b50a..a8f8a6b 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -325,7 +325,7 @@ int remove_file_from_cache(const char *path)
return 0;
}
-int add_file_to_index(const char *path, int verbose)
+int add_file_to_cache(const char *path, int verbose)
{
int size, namelen;
struct stat st;