diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-06-06 12:51:49 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-06 14:30:58 -0700 |
| commit | 021b6e454944a4fba878651ebf9bfe0a3f6c3077 (patch) | |
| tree | 125f7ae01b9c959782e345baa03c7c786cc3f4ce /builtin-read-tree.c | |
| parent | dd8239f997962d94162790039b008acb6068a242 (diff) | |
| download | git-021b6e454944a4fba878651ebf9bfe0a3f6c3077.tar.gz | |
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-read-tree.c')
| -rw-r--r-- | builtin-read-tree.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/builtin-read-tree.c b/builtin-read-tree.c index 8d1a22d373..bb50fbd274 100644 --- a/builtin-read-tree.c +++ b/builtin-read-tree.c @@ -853,7 +853,7 @@ static void prime_cache_tree(void) static const char read_tree_usage[] = "git-read-tree (<sha> | -m [--aggressive] [-u | -i] <sha1> [<sha2> [<sha3>]])"; -static struct cache_file cache_file; +static struct lock_file lock_file; int cmd_read_tree(int argc, const char **argv, char **envp) { @@ -864,9 +864,9 @@ int cmd_read_tree(int argc, const char **argv, char **envp) setup_git_directory(); 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"); git_config(git_default_config); @@ -981,7 +981,7 @@ int cmd_read_tree(int argc, const char **argv, char **envp) } 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"); return 0; } |