diff options
| author | Patrick Steinhardt <ps@pks.im> | 2026-04-01 01:57:48 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-03-31 20:43:13 -0700 |
| commit | ff2e9d85d61f2f51793acbdb4bad68d48cc8bb85 (patch) | |
| tree | 4d5a9fc6b237ed6693af513fc843777b22180ad4 | |
| parent | 75c702624d9a5f60a78c2d4d5e8de83468c9c5ec (diff) | |
| download | git-ff2e9d85d61f2f51793acbdb4bad68d48cc8bb85.tar.xz | |
odb: rename `odb_write_object()` flags
Rename `odb_write_object()` flags to be properly prefixed with the
function name.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | cache-tree.c | 2 | ||||
| -rw-r--r-- | object-file.c | 4 | ||||
| -rw-r--r-- | odb.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/cache-tree.c b/cache-tree.c index 60bcc07c3b..60059edfb0 100644 --- a/cache-tree.c +++ b/cache-tree.c @@ -456,7 +456,7 @@ static int update_one(struct cache_tree *it, hash_object_file(the_hash_algo, buffer.buf, buffer.len, OBJ_TREE, &it->oid); } else if (odb_write_object_ext(the_repository->objects, buffer.buf, buffer.len, OBJ_TREE, - &it->oid, NULL, flags & WRITE_TREE_SILENT ? WRITE_OBJECT_SILENT : 0)) { + &it->oid, NULL, flags & WRITE_TREE_SILENT ? ODB_WRITE_OBJECT_SILENT : 0)) { strbuf_release(&buffer); return -1; } diff --git a/object-file.c b/object-file.c index 4f77ce0982..db1a420ab6 100644 --- a/object-file.c +++ b/object-file.c @@ -909,7 +909,7 @@ static int start_loose_object_common(struct odb_source *source, fd = create_tmpfile(source->odb->repo, tmp_file, filename); if (fd < 0) { - if (flags & WRITE_OBJECT_SILENT) + if (flags & ODB_WRITE_OBJECT_SILENT) return -1; else if (errno == EACCES) return error(_("insufficient permission for adding " @@ -1042,7 +1042,7 @@ static int write_loose_object(struct odb_source *source, utb.actime = mtime; utb.modtime = mtime; if (utime(tmp_file.buf, &utb) < 0 && - !(flags & WRITE_OBJECT_SILENT)) + !(flags & ODB_WRITE_OBJECT_SILENT)) warning_errno(_("failed utime() on %s"), tmp_file.buf); } @@ -568,12 +568,12 @@ enum { * changes that so that the object will be written as a loose object * and persisted. */ - WRITE_OBJECT_PERSIST = (1 << 0), + ODB_WRITE_OBJECT_PERSIST = (1 << 0), /* * Do not print an error in case something goes wrong. */ - WRITE_OBJECT_SILENT = (1 << 1), + ODB_WRITE_OBJECT_SILENT = (1 << 1), }; /* |