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-index.c | |
| parent | sequencer: do not update/refresh index if the lock cannot be held (diff) | |
| download | tgif-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-index.c')
| -rw-r--r-- | builtin/checkout-index.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin/checkout-index.c b/builtin/checkout-index.c index 61e75eb60c..9e49bf2f56 100644 --- a/builtin/checkout-index.c +++ b/builtin/checkout-index.c @@ -279,8 +279,7 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix) checkout_all(prefix, prefix_length); if (0 <= newfd && - (write_cache(newfd, active_cache, active_nr) || - commit_locked_index(&lock_file))) + write_locked_index(&the_index, &lock_file, COMMIT_LOCK)) die("Unable to write new index file"); return 0; } |