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 /checkout-index.c | |
| parent | dd8239f997962d94162790039b008acb6068a242 (diff) | |
| download | git-021b6e454944a4fba878651ebf9bfe0a3f6c3077.tar.gz git-021b6e454944a4fba878651ebf9bfe0a3f6c3077.tar.xz | |
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 'checkout-index.c')
| -rw-r--r-- | checkout-index.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/checkout-index.c b/checkout-index.c index 9876af6fd..ea40bc29b 100644 --- a/checkout-index.c +++ b/checkout-index.c @@ -168,7 +168,7 @@ static int checkout_all(void) static const char checkout_cache_usage[] = "git-checkout-index [-u] [-q] [-a] [-f] [-n] [--stage=[123]|all] [--prefix=<string>] [--temp] [--] <file>..."; -static struct cache_file cache_file; +static struct lock_file lock_file; int main(int argc, char **argv) { @@ -211,9 +211,8 @@ int main(int argc, char **argv) if (!strcmp(arg, "-u") || !strcmp(arg, "--index")) { state.refresh_cache = 1; if (newfd < 0) - 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("cannot open index.lock file."); continue; @@ -262,7 +261,7 @@ int main(int argc, char **argv) */ if (state.refresh_cache) { close(newfd); newfd = -1; - rollback_index_file(&cache_file); + rollback_lock_file(&lock_file); } state.refresh_cache = 0; } @@ -312,7 +311,7 @@ int main(int argc, char **argv) if (0 <= newfd && (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; } |