diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-09-25 15:24:05 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-09-25 15:24:06 +0900 |
| commit | d085f9773a8f53a517a32f0c55a8c49a7cc773a1 (patch) | |
| tree | 531b936f092dc60267cf712b2da5f28b37f3398d | |
| parent | Merge branch 'mg/name-rev-tests-with-short-stack' (diff) | |
| parent | read-cache: fix index corruption with index v4 (diff) | |
| download | tgif-d085f9773a8f53a517a32f0c55a8c49a7cc773a1.tar.xz | |
Merge branch 'kw/write-index-reduce-alloc'
A hotfix to a topic already in 'master'.
* kw/write-index-reduce-alloc:
read-cache: fix index corruption with index v4
Add t/helper/test-write-cache to .gitignore
| -rw-r--r-- | read-cache.c | 4 | ||||
| -rw-r--r-- | t/helper/.gitignore | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/read-cache.c b/read-cache.c index b211c57af6..7d00265c49 100644 --- a/read-cache.c +++ b/read-cache.c @@ -2103,7 +2103,9 @@ static int ce_write_entry(git_SHA_CTX *c, int fd, struct cache_entry *ce, if (!result) result = ce_write(c, fd, to_remove_vi, prefix_size); if (!result) - result = ce_write(c, fd, ce->name + common, ce_namelen(ce) - common + 1); + result = ce_write(c, fd, ce->name + common, ce_namelen(ce) - common); + if (!result) + result = ce_write(c, fd, padding, 1); strbuf_splice(previous_name, common, to_remove, ce->name + common, ce_namelen(ce) - common); diff --git a/t/helper/.gitignore b/t/helper/.gitignore index 721650256e..7c9d28a834 100644 --- a/t/helper/.gitignore +++ b/t/helper/.gitignore @@ -35,3 +35,4 @@ /test-svn-fe /test-urlmatch-normalization /test-wildmatch +/test-write-cache |