diff options
| author | Jeff King <peff@peff.net> | 2017-03-16 14:27:12 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-03-16 18:17:00 (GMT) |
| commit | eaeefc3276c45ff8f8c24775b7dd93155bef7d48 (patch) | |
| tree | 0efbfc9ff756f244375225d3e90383f32aa61b66 /fast-import.c | |
| parent | 1cec8c634fb76ecee862ff88066f55b63b7d5ff7 (diff) | |
| download | git-eaeefc3276c45ff8f8c24775b7dd93155bef7d48.zip git-eaeefc3276c45ff8f8c24775b7dd93155bef7d48.tar.gz git-eaeefc3276c45ff8f8c24775b7dd93155bef7d48.tar.bz2 | |
odb_pack_keep(): stop generating keepfile name
The odb_pack_keep() function generates the name of a .keep
file and opens it. This has two problems:
1. It requires a fixed-size buffer to create the filename
and doesn't notice when the result is truncated.
2. Of the two callers, one sometimes wants to open a
filename it already has, which makes things awkward (it
has to do so manually, and skips the leading-directory
creation).
Instead, let's have odb_pack_keep() just open the file.
Generating the name isn't hard, and a future patch will
switch callers over to odb_pack_name() anyway.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'fast-import.c')
| -rw-r--r-- | fast-import.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fast-import.c b/fast-import.c index 64fe602..7f8371b 100644 --- a/fast-import.c +++ b/fast-import.c @@ -944,7 +944,9 @@ static char *keep_pack(const char *curr_index_name) static const char *keep_msg = "fast-import"; int keep_fd; - keep_fd = odb_pack_keep(name, sizeof(name), pack_data->sha1); + snprintf(name, sizeof(name), "%s/pack/pack-%s.keep", + get_object_directory(), sha1_to_hex(pack_data->sha1)); + keep_fd = odb_pack_keep(name); if (keep_fd < 0) die_errno("cannot create keep file"); write_or_die(keep_fd, keep_msg, strlen(keep_msg)); |