diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-10-26 02:06:57 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-10-26 02:06:57 +0300 |
| commit | 2c428e4205a50cee19669d5b73cc149ec2254a5d (patch) | |
| tree | 1ddebbe9faa0a315a16a923920b6378bdc921479 /cache-tree.c | |
| parent | 6ffb5fc06940ebb312b5cb010246e27c1b6aead0 (diff) | |
| parent | 4ef91a2d795c424eda2bec1bfbbd0c813bcc978a (diff) | |
Merge branch 'ab/fix-commit-error-message-upon-unwritable-object-store'
"git commit" gave duplicated error message when the object store
was unwritable, which has been corrected.
* ab/fix-commit-error-message-upon-unwritable-object-store:
commit: fix duplication regression in permission error output
unwritable tests: assert exact error output
Diffstat (limited to 'cache-tree.c')
| -rw-r--r-- | cache-tree.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cache-tree.c b/cache-tree.c index 90919f9e34..f21bfc631c 100644 --- a/cache-tree.c +++ b/cache-tree.c @@ -440,8 +440,9 @@ static int update_one(struct cache_tree *it, } else if (dryrun) { hash_object_file(the_hash_algo, buffer.buf, buffer.len, tree_type, &it->oid); - } else if (write_object_file(buffer.buf, buffer.len, tree_type, - &it->oid)) { + } else if (write_object_file_flags(buffer.buf, buffer.len, tree_type, + &it->oid, flags & WRITE_TREE_SILENT + ? HASH_SILENT : 0)) { strbuf_release(&buffer); return -1; } |