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 /rerere.c | |
parent | 33c297aacc0ce0f945198fbcdf48fbf2fd27d01b (diff) | |
download | git-03b86647722f11ccc321cd7279aa49b811d17cc2.tar.gz |
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 'rerere.c')
-rw-r--r-- | rerere.c | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -492,8 +492,7 @@ static int update_paths(struct string_list *update) } if (!status && active_cache_changed) { - if (write_cache(fd, active_cache, active_nr) || - commit_locked_index(&index_lock)) + if (write_locked_index(&the_index, &index_lock, COMMIT_LOCK)) die("Unable to write new index file"); } else if (fd >= 0) rollback_lock_file(&index_lock); |