diff options
author | Junio C Hamano <gitster@pobox.com> | 2021-10-25 16:06:57 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-10-25 16:06:57 -0700 |
commit | 2c428e4205a50cee19669d5b73cc149ec2254a5d (patch) | |
tree | 1ddebbe9faa0a315a16a923920b6378bdc921479 /cache.h | |
parent | 6ffb5fc06940ebb312b5cb010246e27c1b6aead0 (diff) | |
parent | 4ef91a2d795c424eda2bec1bfbbd0c813bcc978a (diff) | |
download | git-2c428e4205a50cee19669d5b73cc149ec2254a5d.tar.gz |
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.h')
-rw-r--r-- | cache.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -887,6 +887,7 @@ int ie_modified(struct index_state *, const struct cache_entry *, struct stat *, #define HASH_WRITE_OBJECT 1 #define HASH_FORMAT_CHECK 2 #define HASH_RENORMALIZE 4 +#define HASH_SILENT 8 int index_fd(struct index_state *istate, struct object_id *oid, int fd, struct stat *st, enum object_type type, const char *path, unsigned flags); int index_path(struct index_state *istate, struct object_id *oid, const char *path, struct stat *st, unsigned flags); |