summaryrefslogtreecommitdiff
path: root/write-tree.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 /write-tree.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 'write-tree.c')
-rw-r--r--write-tree.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/write-tree.c b/write-tree.c
index 7a4f691..d6a6058 100644
--- a/write-tree.c
+++ b/write-tree.c
@@ -11,7 +11,7 @@ static int missing_ok = 0;
static const char write_tree_usage[] = "git-write-tree [--missing-ok]";
-static struct cache_file cache_file;
+static struct lock_file lock_file;
int main(int argc, char **argv)
{
@@ -19,7 +19,7 @@ int main(int argc, char **argv)
setup_git_directory();
- newfd = hold_index_file_for_update(&cache_file, get_index_file());
+ newfd = hold_lock_file_for_update(&lock_file, get_index_file());
entries = read_cache();
if (argc == 2) {
if (!strcmp(argv[1], "--missing-ok"))
@@ -45,7 +45,7 @@ int main(int argc, char **argv)
die("git-write-tree: error building trees");
if (0 <= newfd) {
if (!write_cache(newfd, active_cache, active_nr))
- commit_index_file(&cache_file);
+ commit_lock_file(&lock_file);
}
/* Not being able to write is fine -- we are only interested
* in updating the cache-tree part, and if the next caller