diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-06-06 23:42:52 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-06 23:42:52 (GMT) |
| commit | 9941afc051d953ee5e8fd9a8a27c5cd659ef9552 (patch) | |
| tree | 1c2e8296f1cb0e97e341c220a5246bd3154ced7a /builtin-apply.c | |
| parent | 44fe4f522e63d3f01174459af674af2f9c293671 (diff) | |
| parent | e5f38ec3c5d8553413501e6141932b8ccc7aceb4 (diff) | |
| download | git-9941afc051d953ee5e8fd9a8a27c5cd659ef9552.zip git-9941afc051d953ee5e8fd9a8a27c5cd659ef9552.tar.gz git-9941afc051d953ee5e8fd9a8a27c5cd659ef9552.tar.bz2 | |
Merge branch 'jc/lockfile'
* jc/lockfile:
ref-log: style fixes.
refs.c: convert it to use lockfile interface.
Make index file locking code reusable to others.
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 6a4fb96..e113c74 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; |