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-apply.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-apply.c')
| -rw-r--r-- | builtin-apply.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/builtin-apply.c b/builtin-apply.c index 6a4fb9663d..e113c74dd8 100644 --- a/builtin-apply.c +++ b/builtin-apply.c @@ -2072,7 +2072,7 @@ static void write_out_results(struct patch *list, int skipped_patch) } } -static struct cache_file cache_file; +static struct lock_file lock_file; static struct excludes { struct excludes *next; @@ -2133,8 +2133,12 @@ static int apply_patch(int fd, const char *filename) apply = 0; write_index = check_index && apply; - if (write_index && newfd < 0) - newfd = hold_index_file_for_update(&cache_file, get_index_file()); + if (write_index && newfd < 0) { + newfd = hold_lock_file_for_update(&lock_file, + get_index_file()); + if (newfd < 0) + die("unable to create new index file"); + } if (check_index) { if (read_cache() < 0) die("unable to read index file"); @@ -2312,8 +2316,8 @@ int cmd_apply(int argc, const char **argv, char **envp) if (write_index) { if (write_cache(newfd, active_cache, active_nr) || - commit_index_file(&cache_file)) - die("Unable to write new cachefile"); + commit_lock_file(&lock_file)) + die("Unable to write new index file"); } return 0; |