summaryrefslogtreecommitdiff
path: root/builtin-add.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-06-06 19:51:49 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-06-06 21:30:58 (GMT)
commit021b6e454944a4fba878651ebf9bfe0a3f6c3077 (patch)
tree125f7ae01b9c959782e345baa03c7c786cc3f4ce /builtin-add.c
parentdd8239f997962d94162790039b008acb6068a242 (diff)
downloadgit-021b6e454944a4fba878651ebf9bfe0a3f6c3077.zip
git-021b6e454944a4fba878651ebf9bfe0a3f6c3077.tar.gz
git-021b6e454944a4fba878651ebf9bfe0a3f6c3077.tar.bz2
Make index file locking code reusable to others.
The framework to create lockfiles that are removed at exit is first used to reliably write the index file, but it is applicable to other things, so stop calling it "cache_file". This also rewords a few remaining error message that called the index file "cache file". Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-add.c')
-rw-r--r--builtin-add.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/builtin-add.c b/builtin-add.c
index 02fe38b..bfbbb1b 100644
--- a/builtin-add.c
+++ b/builtin-add.c
@@ -122,7 +122,7 @@ static int add_file_to_index(const char *path, int verbose)
return 0;
}
-static struct cache_file cache_file;
+static struct lock_file lock_file;
int cmd_add(int argc, const char **argv, char **envp)
{
@@ -134,9 +134,9 @@ int cmd_add(int argc, const char **argv, char **envp)
git_config(git_default_config);
- newfd = hold_index_file_for_update(&cache_file, get_index_file());
+ newfd = hold_lock_file_for_update(&lock_file, get_index_file());
if (newfd < 0)
- die("unable to create new cachefile");
+ die("unable to create new index file");
if (read_cache() < 0)
die("index file corrupt");
@@ -181,7 +181,7 @@ int cmd_add(int argc, const char **argv, char **envp)
if (active_cache_changed) {
if (write_cache(newfd, active_cache, active_nr) ||
- commit_index_file(&cache_file))
+ commit_lock_file(&lock_file))
die("Unable to write new index file");
}