From 7db40d450de401100922b023ec5e687bc1a6d4d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn=20Nieto?= Date: Sat, 23 Jul 2011 13:57:06 +0200 Subject: [PATCH] index: use git_futils_readbuffer_updated MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This helps readability a bit as well. Signed-off-by: Carlos Martín Nieto --- src/index.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/src/index.c b/src/index.c index 6390da3d7..5afe44954 100644 --- a/src/index.c +++ b/src/index.c @@ -248,8 +248,9 @@ void git_index_clear(git_index *index) int git_index_read(git_index *index) { - struct stat indexst; - int error = GIT_SUCCESS; + int error = GIT_SUCCESS, updated; + git_fbuffer buffer = GIT_FBUFFER_INIT; + time_t mtime; assert(index->index_file_path); @@ -259,30 +260,24 @@ int git_index_read(git_index *index) return GIT_SUCCESS; } - if (p_stat(index->index_file_path, &indexst) < 0) - return git__throw(GIT_EOSERR, "Failed to read index. %s does not exist or is corrupted", index->index_file_path); - - if (!S_ISREG(indexst.st_mode)) - return git__throw(GIT_ENOTFOUND, "Failed to read index. %s is not an index file", index->index_file_path); - - if (indexst.st_mtime != index->last_modified) { - - git_fbuffer buffer; - - if ((error = git_futils_readbuffer(&buffer, index->index_file_path)) < GIT_SUCCESS) - return git__rethrow(error, "Failed to read index"); + /* We don't want to update the mtime if we fail to parse the index */ + mtime = index->last_modified; + error = git_futils_readbuffer_updated(&buffer, index->index_file_path, &mtime, &updated); + if (error < GIT_SUCCESS) + return git__rethrow(error, "Failed to read index"); + if (updated) { git_index_clear(index); error = parse_index(index, buffer.data, buffer.len); if (error == GIT_SUCCESS) - index->last_modified = indexst.st_mtime; + index->last_modified = mtime; git_futils_freebuffer(&buffer); } if (error < GIT_SUCCESS) - return git__rethrow(error, "Failed to read index"); + return git__rethrow(error, "Failed to parse index"); return error; }