summaryrefslogtreecommitdiff
path: root/builtin/index-pack.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2017-03-16 14:27:12 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-03-16 18:17:00 (GMT)
commiteaeefc3276c45ff8f8c24775b7dd93155bef7d48 (patch)
tree0efbfc9ff756f244375225d3e90383f32aa61b66 /builtin/index-pack.c
parent1cec8c634fb76ecee862ff88066f55b63b7d5ff7 (diff)
downloadgit-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 'builtin/index-pack.c')
-rw-r--r--builtin/index-pack.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index f4b87c6..a58bc6b 100644
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -1402,10 +1402,10 @@ static void final(const char *final_pack_name, const char *curr_pack_name,
int keep_fd, keep_msg_len = strlen(keep_msg);
if (!keep_name)
- keep_fd = odb_pack_keep(name, sizeof(name), sha1);
- else
- keep_fd = open(keep_name, O_RDWR|O_CREAT|O_EXCL, 0600);
+ snprintf(name, sizeof(name), "%s/pack/pack-%s.keep",
+ get_object_directory(), sha1_to_hex(sha1));
+ keep_fd = odb_pack_keep(keep_name ? keep_name : name);
if (keep_fd < 0) {
if (errno != EEXIST)
die_errno(_("cannot write keep file '%s'"),