diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-04-24 21:50:48 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-04-24 21:50:48 -0700 |
| commit | 31c6390d40fe12a46c38d7224da61c6771886f2a (patch) | |
| tree | 3856f02ce893c6254fcb0940ec57566ec385bb76 /cache-tree.c | |
| parent | 3ffb58be0a779b47e1e4d3ea584ba301461a3a77 (diff) | |
| parent | 3ef6a1fe95b0a5aaca21a86651850ef5d62327fa (diff) | |
| download | git-31c6390d40fe12a46c38d7224da61c6771886f2a.tar.gz git-31c6390d40fe12a46c38d7224da61c6771886f2a.tar.xz | |
Merge branch 'maint-1.5.4' into maint
* maint-1.5.4:
t5516: remove ambiguity test (1)
Linked glossary from cvs-migration page
write-tree: properly detect failure to write tree objects
Diffstat (limited to 'cache-tree.c')
| -rw-r--r-- | cache-tree.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cache-tree.c b/cache-tree.c index 39da54d1e..73cb34070 100644 --- a/cache-tree.c +++ b/cache-tree.c @@ -341,8 +341,11 @@ static int update_one(struct cache_tree *it, if (dryrun) hash_sha1_file(buffer.buf, buffer.len, tree_type, it->sha1); - else - write_sha1_file(buffer.buf, buffer.len, tree_type, it->sha1); + else if (write_sha1_file(buffer.buf, buffer.len, tree_type, it->sha1)) { + strbuf_release(&buffer); + return -1; + } + strbuf_release(&buffer); it->entry_count = i; #if DEBUG |