diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-06-25 22:49:48 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-06-25 22:49:48 +0400 |
commit | 1881d2b88c4b889dcb95782ad4bc5395808438e9 (patch) | |
tree | cab7b82ccfc98e89b355c3dc209b7ec6656e1b93 /git-compat-util.h | |
parent | 85785df6d6db50ff37d0ff1878c16ad69a063f6a (diff) | |
parent | 426ddeead6112955dfb50ccf9bb4af05d1ca9082 (diff) |
Merge branch 'ym/fix-opportunistic-index-update-race' into maint
"git status", even though it is a read-only operation, tries to
update the index with refreshed lstat(2) info to optimize future
accesses to the working tree opportunistically, but this could
race with a "read-write" operation that modify the index while it
is running. Detect such a race and avoid overwriting the index.
* ym/fix-opportunistic-index-update-race:
read-cache.c: verify index file before we opportunistically update it
wrapper.c: add xpread() similar to xread()
Diffstat (limited to 'git-compat-util.h')
-rw-r--r-- | git-compat-util.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/git-compat-util.h b/git-compat-util.h index f6d3a46622..e6a4159a25 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -531,6 +531,7 @@ extern void *xcalloc(size_t nmemb, size_t size); extern void *xmmap(void *start, size_t length, int prot, int flags, int fd, off_t offset); extern ssize_t xread(int fd, void *buf, size_t len); extern ssize_t xwrite(int fd, const void *buf, size_t len); +extern ssize_t xpread(int fd, void *buf, size_t len, off_t offset); extern int xdup(int fd); extern FILE *xfdopen(int fd, const char *mode); extern int xmkstemp(char *template); |