From 03b86647722f11ccc321cd7279aa49b811d17cc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= Date: Fri, 13 Jun 2014 19:19:23 +0700 Subject: read-cache: new API write_locked_index instead of write_index/write_cache MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- rerere.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'rerere.c') diff --git a/rerere.c b/rerere.c index d55aa8a01b..ffc6a5b168 100644 --- a/rerere.c +++ b/rerere.c @@ -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); -- cgit v1.2.1