diff options
| author | Patrick Steinhardt <ps@pks.im> | 2025-04-29 09:52:17 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-04-29 10:08:12 -0700 |
| commit | 0b8ed25b66aedc9f4fe44d1a5cab2719290b22a9 (patch) | |
| tree | 65a7f303e6d38747541900fc449abc43288a70a1 /builtin | |
| parent | 56ef85e82ffa39ac86db39bc0ac11c67451d0e5b (diff) | |
| download | git-0b8ed25b66aedc9f4fe44d1a5cab2719290b22a9.tar.xz | |
object-store: move and rename `odb_pack_keep()`
The function `odb_pack_keep()` creates a file at the passed-in path. If
this fails, then the function re-tries by first creating any potentially
missing leading directories and then trying to create the file once
again. As such, this function doesn't host any kind of logic that is
specific to the object store, but is rather a generic helper function.
Rename the function to `safe_create_file_with_leading_directories()` and
move it into "path.c". While at it, refactor it so that it loses its
dependency on `the_repository`.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/fast-import.c | 3 | ||||
| -rw-r--r-- | builtin/index-pack.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/builtin/fast-import.c b/builtin/fast-import.c index c1e198f4e3..b2839c5f43 100644 --- a/builtin/fast-import.c +++ b/builtin/fast-import.c @@ -811,7 +811,8 @@ static char *keep_pack(const char *curr_index_name) int keep_fd; odb_pack_name(pack_data->repo, &name, pack_data->hash, "keep"); - keep_fd = odb_pack_keep(name.buf); + keep_fd = safe_create_file_with_leading_directories(pack_data->repo, + name.buf); if (keep_fd < 0) die_errno("cannot create keep file"); write_or_die(keep_fd, keep_msg, strlen(keep_msg)); diff --git a/builtin/index-pack.c b/builtin/index-pack.c index 60a8ee05db..f49431d626 100644 --- a/builtin/index-pack.c +++ b/builtin/index-pack.c @@ -1565,7 +1565,7 @@ static void write_special_file(const char *suffix, const char *msg, else filename = odb_pack_name(the_repository, &name_buf, hash, suffix); - fd = odb_pack_keep(filename); + fd = safe_create_file_with_leading_directories(the_repository, filename); if (fd < 0) { if (errno != EEXIST) die_errno(_("cannot write %s file '%s'"), |