diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2014-06-13 19:19:23 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-13 11:49:10 -0700 |
| commit | 03b86647722f11ccc321cd7279aa49b811d17cc2 (patch) | |
| tree | dc5b717a01867692ce344d1548ad5a82ac1c1881 /builtin/checkout.c | |
| parent | 33c297aacc0ce0f945198fbcdf48fbf2fd27d01b (diff) | |
| download | git-03b86647722f11ccc321cd7279aa49b811d17cc2.tar.gz git-03b86647722f11ccc321cd7279aa49b811d17cc2.tar.xz | |
read-cache: new API write_locked_index instead of write_index/write_cache
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/checkout.c')
| -rw-r--r-- | builtin/checkout.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index 07cf55530..944a634bc 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -225,7 +225,6 @@ static int checkout_paths(const struct checkout_opts *opts, int flag; struct commit *head; int errs = 0; - int newfd; struct lock_file *lock_file; if (opts->track != BRANCH_TRACK_UNSPECIFIED) @@ -256,7 +255,7 @@ static int checkout_paths(const struct checkout_opts *opts, lock_file = xcalloc(1, sizeof(struct lock_file)); - newfd = hold_locked_index(lock_file, 1); + hold_locked_index(lock_file, 1); if (read_cache_preload(&opts->pathspec) < 0) return error(_("corrupt index file")); @@ -352,8 +351,7 @@ static int checkout_paths(const struct checkout_opts *opts, } } - if (write_cache(newfd, active_cache, active_nr) || - commit_locked_index(lock_file)) + if (write_locked_index(&the_index, lock_file, COMMIT_LOCK)) die(_("unable to write new index file")); read_ref_full("HEAD", rev, 0, &flag); @@ -444,8 +442,8 @@ static int merge_working_tree(const struct checkout_opts *opts, { int ret; struct lock_file *lock_file = xcalloc(1, sizeof(struct lock_file)); - int newfd = hold_locked_index(lock_file, 1); + hold_locked_index(lock_file, 1); if (read_cache_preload(NULL) < 0) return error(_("corrupt index file")); @@ -553,8 +551,7 @@ static int merge_working_tree(const struct checkout_opts *opts, } } - if (write_cache(newfd, active_cache, active_nr) || - commit_locked_index(lock_file)) + if (write_locked_index(&the_index, lock_file, COMMIT_LOCK)) die(_("unable to write new index file")); if (!opts->force && !opts->quiet) |