kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'ps/object-file-cleanup' 

Code clean-up.

* ps/object-file-cleanup:
  object-store: merge "object-store-ll.h" and "object-store.h"
  object-store: remove global array of cached objects
  object: split out functions relating to object store subsystem
  object-file: drop `index_blob_stream()`
  object-file: split up concerns of `HASH_*` flags
  object-file: split out functions relating to object store subsystem
  object-file: move `xmmap()` into "wrapper.c"
  object-file: move `git_open_cloexec()` to "compat/open.c"
  object-file: move `safe_create_leading_directories()` into "path.c"
  object-file: move `mkdir_in_gitdir()` into "path.c"
main
Junio C Hamano 2025-04-24 17:25:33 -07:00
parent 51ddc126de 68cd492a3e
commit 36d8035d27
149 changed files with 2144 additions and 2064 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -994,6 +994,7 @@ LIB_OBJS += common-exit.o
LIB_OBJS += common-init.o
LIB_OBJS += compat/nonblock.o
LIB_OBJS += compat/obstack.o
LIB_OBJS += compat/open.o
LIB_OBJS += compat/terminal.o
LIB_OBJS += compiler-tricks/not-constant.o
LIB_OBJS += config.o
@ -1084,6 +1085,7 @@ LIB_OBJS += notes.o
LIB_OBJS += object-file-convert.o
LIB_OBJS += object-file.o
LIB_OBJS += object-name.o
LIB_OBJS += object-store.o
LIB_OBJS += object.o
LIB_OBJS += oid-array.o
LIB_OBJS += oidmap.o
@ -1811,7 +1813,6 @@ ifdef FREAD_READS_DIRECTORIES
endif
ifdef OPEN_RETURNS_EINTR
COMPAT_CFLAGS += -DOPEN_RETURNS_EINTR
COMPAT_OBJS += compat/open.o
endif
ifdef NO_SYMLINK_HEAD
BASIC_CFLAGS += -DNO_SYMLINK_HEAD

2
apply.c
View File

@ -14,7 +14,7 @@
#include "abspath.h"
#include "base85.h"
#include "config.h"
#include "object-store-ll.h"
#include "object-store.h"
#include "delta.h"
#include "diff.h"
#include "dir.h"

2
archive-tar.c
View File

@ -11,7 +11,7 @@
#include "hex.h"
#include "tar.h"
#include "archive.h"
#include "object-store-ll.h"
#include "object-store.h"
#include "strbuf.h"
#include "streaming.h"
#include "run-command.h"

2
archive-zip.c
View File

@ -12,7 +12,7 @@
#include "hex.h"
#include "streaming.h"
#include "utf8.h"
#include "object-store-ll.h"
#include "object-store.h"
#include "strbuf.h"
#include "userdiff.h"
#include "write-or-die.h"

2
archive.c
View File

@ -14,7 +14,7 @@
#include "pretty.h"
#include "setup.h"
#include "refs.h"
#include "object-store-ll.h"
#include "object-store.h"
#include "commit.h"
#include "tree.h"
#include "tree-walk.h"

2
attr.c
View File

@ -22,7 +22,7 @@
#include "read-cache-ll.h"
#include "refs.h"
#include "revision.h"
#include "object-store-ll.h"
#include "object-store.h"
#include "setup.h"
#include "thread-utils.h"
#include "tree-walk.h"

2
bisect.c
View File

@ -20,7 +20,7 @@
#include "commit-slab.h"
#include "commit-reach.h"
#include "object-name.h"
#include "object-store-ll.h"
#include "object-store.h"
#include "path.h"
#include "dir.h"


4
blame.c
View File

@ -3,7 +3,7 @@

#include "git-compat-util.h"
#include "refs.h"
#include "object-store-ll.h"
#include "object-store.h"
#include "cache-tree.h"
#include "mergesort.h"
#include "commit.h"
@ -277,7 +277,7 @@ static struct commit *fake_working_tree_commit(struct repository *r,
convert_to_git(r->index, path, buf.buf, buf.len, &buf, 0);
origin->file.ptr = buf.buf;
origin->file.size = buf.len;
pretend_object_file(buf.buf, buf.len, OBJ_BLOB, &origin->blob_oid);
pretend_object_file(the_repository, buf.buf, buf.len, OBJ_BLOB, &origin->blob_oid);

/*
* Read the current index, replace the path entry with

2
builtin/backfill.c
View File

@ -13,7 +13,7 @@
#include "tree.h"
#include "tree-walk.h"
#include "object.h"
#include "object-store-ll.h"
#include "object-store.h"
#include "oid-array.h"
#include "oidset.h"
#include "promisor-remote.h"

2
builtin/blame.c
View File

@ -28,7 +28,7 @@
#include "line-log.h"
#include "progress.h"
#include "object-name.h"
#include "object-store-ll.h"
#include "object-store.h"
#include "pager.h"
#include "blame.h"
#include "refs.h"

4
builtin/bugreport.c
View File

@ -4,13 +4,13 @@
#include "editor.h"
#include "gettext.h"
#include "parse-options.h"
#include "path.h"
#include "strbuf.h"
#include "help.h"
#include "compat/compiler.h"
#include "hook.h"
#include "hook-list.h"
#include "diagnose.h"
#include "object-file.h"
#include "setup.h"
#include "version.h"

@ -141,7 +141,7 @@ int cmd_bugreport(int argc,
}
strbuf_addstr(&report_path, ".txt");

switch (safe_create_leading_directories(report_path.buf)) {
switch (safe_create_leading_directories(the_repository, report_path.buf)) {
case SCLD_OK:
case SCLD_EXISTS:
break;

2
builtin/cat-file.c
View File

@ -24,7 +24,7 @@
#include "pack-bitmap.h"
#include "object-file.h"
#include "object-name.h"
#include "object-store-ll.h"
#include "object-store.h"
#include "replace-object.h"
#include "promisor-remote.h"
#include "mailmap.h"

3
builtin/checkout.c
View File

@ -18,8 +18,9 @@
#include "lockfile.h"
#include "mem-pool.h"
#include "merge-ort-wrappers.h"
#include "object-file.h"
#include "object-name.h"
#include "object-store-ll.h"
#include "object-store.h"
#include "parse-options.h"
#include "path.h"
#include "preload-index.h"

6
builtin/clone.c
View File

@ -25,7 +25,7 @@
#include "refs.h"
#include "refspec.h"
#include "object-file.h"
#include "object-store-ll.h"
#include "object-store.h"
#include "tree.h"
#include "tree-walk.h"
#include "unpack-trees.h"
@ -1092,7 +1092,7 @@ int cmd_clone(int argc,
sigchain_push_common(remove_junk_on_signal);

if (!option_bare) {
if (safe_create_leading_directories_const(work_tree) < 0)
if (safe_create_leading_directories_const(the_repository, work_tree) < 0)
die_errno(_("could not create leading directories of '%s'"),
work_tree);
if (dest_exists)
@ -1113,7 +1113,7 @@ int cmd_clone(int argc,
junk_git_dir_flags |= REMOVE_DIR_KEEP_TOPLEVEL;
junk_git_dir = git_dir;
}
if (safe_create_leading_directories_const(git_dir) < 0)
if (safe_create_leading_directories_const(the_repository, git_dir) < 0)
die(_("could not create leading directories of '%s'"), git_dir);

if (0 <= option_verbosity) {

2
builtin/commit-graph.c
View File

@ -6,7 +6,7 @@
#include "hex.h"
#include "parse-options.h"
#include "commit-graph.h"
#include "object-store-ll.h"
#include "object-store.h"
#include "progress.h"
#include "replace-object.h"
#include "strbuf.h"

2
builtin/commit-tree.c
View File

@ -9,7 +9,7 @@
#include "gettext.h"
#include "hex.h"
#include "object-name.h"
#include "object-store-ll.h"
#include "object-store.h"

#include "commit.h"
#include "parse-options.h"

2
builtin/count-objects.c
View File

@ -12,7 +12,7 @@
#include "parse-options.h"
#include "quote.h"
#include "packfile.h"
#include "object-store-ll.h"
#include "object-store.h"

static unsigned long garbage;
static off_t size_garbage;

4
builtin/credential-cache--daemon.c
View File

@ -2,8 +2,8 @@
#include "builtin.h"
#include "abspath.h"
#include "gettext.h"
#include "object-file.h"
#include "parse-options.h"
#include "path.h"

#ifndef NO_UNIX_SOCKETS

@ -271,7 +271,7 @@ static void init_socket_directory(const char *path)
* condition in which somebody can chdir to it, sleep, then try to open
* our protected socket.
*/
if (safe_create_leading_directories_const(dir) < 0)
if (safe_create_leading_directories_const(the_repository, dir) < 0)
die_errno("unable to create directories for '%s'", dir);
if (mkdir(dir, 0700) < 0)
die_errno("unable to mkdir '%s'", dir);

2
builtin/describe.c
View File

@ -19,7 +19,7 @@
#include "setup.h"
#include "strvec.h"
#include "run-command.h"
#include "object-store-ll.h"
#include "object-store.h"
#include "list-objects.h"
#include "commit-slab.h"
#include "wildmatch.h"

4
builtin/diagnose.c
View File

@ -3,8 +3,8 @@
#include "builtin.h"
#include "abspath.h"
#include "gettext.h"
#include "object-file.h"
#include "parse-options.h"
#include "path.h"
#include "diagnose.h"

static const char * const diagnose_usage[] = {
@ -50,7 +50,7 @@ int cmd_diagnose(int argc,
strbuf_addftime(&zip_path, option_suffix, localtime_r(&now, &tm), 0, 0);
strbuf_addstr(&zip_path, ".zip");

switch (safe_create_leading_directories(zip_path.buf)) {
switch (safe_create_leading_directories(the_repository, zip_path.buf)) {
case SCLD_OK:
case SCLD_EXISTS:
break;

31
builtin/difftool.c
View File

@ -22,6 +22,7 @@
#include "gettext.h"
#include "hex.h"
#include "parse-options.h"
#include "path.h"
#include "read-cache-ll.h"
#include "repository.h"
#include "sparse-index.h"
@ -29,7 +30,7 @@
#include "strbuf.h"
#include "lockfile.h"
#include "object-file.h"
#include "object-store-ll.h"
#include "object-store.h"
#include "dir.h"
#include "entry.h"
#include "setup.h"
@ -271,9 +272,9 @@ static void changed_files(struct repository *repo,
strbuf_release(&buf);
}

static int ensure_leading_directories(char *path)
static int ensure_leading_directories(struct repository *repo, char *path)
{
switch (safe_create_leading_directories(path)) {
switch (safe_create_leading_directories(repo, path)) {
case SCLD_OK:
case SCLD_EXISTS:
return 0;
@ -341,11 +342,12 @@ static int checkout_path(unsigned mode, struct object_id *oid,
return ret;
}

static void write_file_in_directory(struct strbuf *dir, size_t dir_len,
const char *path, const char *content)
static void write_file_in_directory(struct repository *repo,
struct strbuf *dir, size_t dir_len,
const char *path, const char *content)
{
add_path(dir, dir_len, path);
ensure_leading_directories(dir->buf);
ensure_leading_directories(repo, dir->buf);
unlink(dir->buf);
write_file(dir->buf, "%s", content);
}
@ -356,14 +358,15 @@ static void write_file_in_directory(struct strbuf *dir, size_t dir_len,
* as text files, resulting in behavior that is analogous to what "git diff"
* displays for symlink and submodule diffs.
*/
static void write_standin_files(struct pair_entry *entry,
struct strbuf *ldir, size_t ldir_len,
struct strbuf *rdir, size_t rdir_len)
static void write_standin_files(struct repository *repo,
struct pair_entry *entry,
struct strbuf *ldir, size_t ldir_len,
struct strbuf *rdir, size_t rdir_len)
{
if (*entry->left)
write_file_in_directory(ldir, ldir_len, entry->path, entry->left);
write_file_in_directory(repo, ldir, ldir_len, entry->path, entry->left);
if (*entry->right)
write_file_in_directory(rdir, rdir_len, entry->path, entry->right);
write_file_in_directory(repo, rdir, rdir_len, entry->path, entry->right);
}

static int run_dir_diff(struct repository *repo,
@ -533,7 +536,7 @@ static int run_dir_diff(struct repository *repo,
ADD_CACHE_JUST_APPEND);

add_path(&rdir, rdir_len, dst_path);
if (ensure_leading_directories(rdir.buf)) {
if (ensure_leading_directories(repo, rdir.buf)) {
ret = error("could not create "
"directory for '%s'",
dst_path);
@ -576,7 +579,7 @@ static int run_dir_diff(struct repository *repo,
*/
hashmap_for_each_entry(&submodules, &iter, entry,
entry /* member name */) {
write_standin_files(entry, &ldir, ldir_len, &rdir, rdir_len);
write_standin_files(repo, entry, &ldir, ldir_len, &rdir, rdir_len);
}

/*
@ -587,7 +590,7 @@ static int run_dir_diff(struct repository *repo,
hashmap_for_each_entry(&symlinks2, &iter, entry,
entry /* member name */) {

write_standin_files(entry, &ldir, ldir_len, &rdir, rdir_len);
write_standin_files(repo, entry, &ldir, ldir_len, &rdir, rdir_len);
}

strbuf_setlen(&ldir, ldir_len);

2
builtin/fast-export.c
View File

@ -14,7 +14,7 @@
#include "refs.h"
#include "refspec.h"
#include "object-file.h"
#include "object-store-ll.h"
#include "object-store.h"
#include "commit.h"
#include "object.h"
#include "tag.h"

4
builtin/fast-import.c
View File

@ -24,7 +24,7 @@
#include "packfile.h"
#include "object-file.h"
#include "object-name.h"
#include "object-store-ll.h"
#include "object-store.h"
#include "mem-pool.h"
#include "commit-reach.h"
#include "khash.h"
@ -1720,7 +1720,7 @@ static void dump_marks(void)
if (!export_marks_file || (import_marks_file && !import_marks_file_done))
return;

if (safe_create_leading_directories_const(export_marks_file)) {
if (safe_create_leading_directories_const(the_repository, export_marks_file)) {
failure |= error_errno("unable to create leading directories of %s",
export_marks_file);
return;

2
builtin/fetch.c
View File

@ -14,7 +14,7 @@
#include "refs.h"
#include "refspec.h"
#include "object-name.h"
#include "object-store-ll.h"
#include "object-store.h"
#include "oidset.h"
#include "oid-array.h"
#include "commit.h"

4
builtin/fsck.c
View File

@ -17,7 +17,7 @@
#include "packfile.h"
#include "object-file.h"
#include "object-name.h"
#include "object-store-ll.h"
#include "object-store.h"
#include "path.h"
#include "read-cache-ll.h"
#include "replace-object.h"
@ -332,7 +332,7 @@ static void check_unreachable_object(struct object *obj)
describe_object(&obj->oid));
FILE *f;

if (safe_create_leading_directories_const(filename)) {
if (safe_create_leading_directories_const(the_repository, filename)) {
error(_("could not create lost-found"));
free(filename);
return;

9
builtin/gc.c
View File

@ -28,8 +28,7 @@
#include "commit.h"
#include "commit-graph.h"
#include "packfile.h"
#include "object-file.h"
#include "object-store-ll.h"
#include "object-store.h"
#include "pack.h"
#include "pack-objects.h"
#include "path.h"
@ -2169,7 +2168,7 @@ static int launchctl_schedule_plist(const char *exec_path, enum schedule_priorit
}
strbuf_addstr(&plist, "</array>\n</dict>\n</plist>\n");

if (safe_create_leading_directories(filename))
if (safe_create_leading_directories(the_repository, filename))
die(_("failed to create directories for '%s'"), filename);

if ((long)lock_file_timeout_ms < 0 &&
@ -2635,7 +2634,7 @@ static int systemd_timer_write_timer_file(enum schedule_priority schedule,

filename = xdg_config_home_systemd(local_timer_name);

if (safe_create_leading_directories(filename)) {
if (safe_create_leading_directories(the_repository, filename)) {
error(_("failed to create directories for '%s'"), filename);
goto error;
}
@ -2708,7 +2707,7 @@ static int systemd_timer_write_service_template(const char *exec_path)
char *local_service_name = xstrfmt(SYSTEMD_UNIT_FORMAT, "", "service");

filename = xdg_config_home_systemd(local_service_name);
if (safe_create_leading_directories(filename)) {
if (safe_create_leading_directories(the_repository, filename)) {
error(_("failed to create directories for '%s'"), filename);
goto error;
}

2
builtin/grep.c
View File

@ -26,7 +26,7 @@
#include "submodule-config.h"
#include "object-file.h"
#include "object-name.h"
#include "object-store-ll.h"
#include "object-store.h"
#include "packfile.h"
#include "pager.h"
#include "path.h"

25
builtin/hash-object.c
View File

@ -11,7 +11,7 @@
#include "gettext.h"
#include "hex.h"
#include "object-file.h"
#include "object-store-ll.h"
#include "object-store.h"
#include "blob.h"
#include "quote.h"
#include "parse-options.h"
@ -19,6 +19,11 @@
#include "strbuf.h"
#include "write-or-die.h"

enum {
HASH_OBJECT_CHECK = (1 << 0),
HASH_OBJECT_WRITE = (1 << 1),
};

/*
* This is to create corrupt objects for debugging and as such it
* needs to bypass the data conversion performed by, and the type
@ -33,7 +38,7 @@ static int hash_literally(struct object_id *oid, int fd, const char *type, unsig
ret = -1;
else
ret = write_object_file_literally(buf.buf, buf.len, type, oid,
flags);
(flags & HASH_OBJECT_WRITE) ? WRITE_OBJECT_FILE_PERSIST : 0);
close(fd);
strbuf_release(&buf);
return ret;
@ -42,15 +47,21 @@ static int hash_literally(struct object_id *oid, int fd, const char *type, unsig
static void hash_fd(int fd, const char *type, const char *path, unsigned flags,
int literally)
{
unsigned int index_flags = 0;
struct stat st;
struct object_id oid;

if (flags & HASH_OBJECT_WRITE)
index_flags |= INDEX_WRITE_OBJECT;
if (flags & HASH_OBJECT_CHECK)
index_flags |= INDEX_FORMAT_CHECK;

if (fstat(fd, &st) < 0 ||
(literally
? hash_literally(&oid, fd, type, flags)
: index_fd(the_repository->index, &oid, fd, &st,
type_from_string(type), path, flags)))
die((flags & HASH_WRITE_OBJECT)
type_from_string(type), path, index_flags)))
die((flags & HASH_OBJECT_WRITE)
? "Unable to add %s to database"
: "Unable to hash %s", path);
printf("%s\n", oid_to_hex(&oid));
@ -102,13 +113,13 @@ int cmd_hash_object(int argc,
int no_filters = 0;
int literally = 0;
int nongit = 0;
unsigned flags = HASH_FORMAT_CHECK;
unsigned flags = HASH_OBJECT_CHECK;
const char *vpath = NULL;
char *vpath_free = NULL;
const struct option hash_object_options[] = {
OPT_STRING('t', NULL, &type, N_("type"), N_("object type")),
OPT_BIT('w', NULL, &flags, N_("write the object into the object database"),
HASH_WRITE_OBJECT),
HASH_OBJECT_WRITE),
OPT_COUNTUP( 0 , "stdin", &hashstdin, N_("read the object from stdin")),
OPT_BOOL( 0 , "stdin-paths", &stdin_paths, N_("read file names from stdin")),
OPT_BOOL( 0 , "no-filters", &no_filters, N_("store file as is without filters")),
@ -122,7 +133,7 @@ int cmd_hash_object(int argc,
argc = parse_options(argc, argv, prefix, hash_object_options,
hash_object_usage, 0);

if (flags & HASH_WRITE_OBJECT)
if (flags & HASH_OBJECT_WRITE)
prefix = setup_git_directory();
else
prefix = setup_git_directory_gently(&nongit);

2
builtin/index-pack.c
View File

@ -21,7 +21,7 @@
#include "packfile.h"
#include "pack-revindex.h"
#include "object-file.h"
#include "object-store-ll.h"
#include "object-store.h"
#include "oid-array.h"
#include "oidset.h"
#include "path.h"

3
builtin/init-db.c
View File

@ -8,7 +8,6 @@
#include "abspath.h"
#include "environment.h"
#include "gettext.h"
#include "object-file.h"
#include "parse-options.h"
#include "path.h"
#include "refs.h"
@ -134,7 +133,7 @@ int cmd_init_db(int argc,
*/
saved = repo_settings_get_shared_repository(the_repository);
repo_settings_set_shared_repository(the_repository, 0);
switch (safe_create_leading_directories_const(argv[0])) {
switch (safe_create_leading_directories_const(the_repository, argv[0])) {
case SCLD_OK:
case SCLD_PERMS:
break;

6
builtin/log.c
View File

@ -14,9 +14,8 @@
#include "gettext.h"
#include "hex.h"
#include "refs.h"
#include "object-file.h"
#include "object-name.h"
#include "object-store-ll.h"
#include "object-store.h"
#include "pager.h"
#include "color.h"
#include "commit.h"
@ -29,6 +28,7 @@
#include "tag.h"
#include "reflog-walk.h"
#include "patch-ids.h"
#include "path.h"
#include "shortlog.h"
#include "remote.h"
#include "string-list.h"
@ -2311,7 +2311,7 @@ int cmd_format_patch(int argc,
*/
saved = repo_settings_get_shared_repository(the_repository);
repo_settings_set_shared_repository(the_repository, 0);
switch (safe_create_leading_directories_const(output_directory)) {
switch (safe_create_leading_directories_const(the_repository, output_directory)) {
case SCLD_OK:
case SCLD_EXISTS:
break;

2
builtin/ls-tree.c
View File

@ -10,7 +10,7 @@
#include "gettext.h"
#include "hex.h"
#include "object-name.h"
#include "object-store-ll.h"
#include "object-store.h"
#include "tree.h"
#include "path.h"
#include "quote.h"

1
builtin/merge-file.c
View File

@ -5,6 +5,7 @@
#include "abspath.h"
#include "diff.h"
#include "hex.h"
#include "object-file.h"
#include "object-name.h"
#include "object-store.h"
#include "config.h"

2
builtin/merge-tree.c
View File

@ -10,7 +10,7 @@
#include "commit-reach.h"
#include "merge-ort.h"
#include "object-name.h"
#include "object-store-ll.h"
#include "object-store.h"
#include "parse-options.h"
#include "blob.h"
#include "merge-blobs.h"

2
builtin/mktag.c
View File

@ -6,7 +6,7 @@
#include "strbuf.h"
#include "replace-object.h"
#include "object-file.h"
#include "object-store-ll.h"
#include "object-store.h"
#include "fsck.h"
#include "config.h"


3
builtin/mktree.c
View File

@ -11,7 +11,8 @@
#include "strbuf.h"
#include "tree.h"
#include "parse-options.h"
#include "object-store-ll.h"
#include "object-file.h"
#include "object-store.h"

static struct treeent {
unsigned mode;

2
builtin/multi-pack-index.c
View File

@ -7,7 +7,7 @@
#include "midx.h"
#include "strbuf.h"
#include "trace2.h"
#include "object-store-ll.h"
#include "object-store.h"
#include "replace-object.h"
#include "repository.h"


3
builtin/mv.c
View File

@ -15,6 +15,7 @@
#include "gettext.h"
#include "name-hash.h"
#include "object-file.h"
#include "path.h"
#include "pathspec.h"
#include "lockfile.h"
#include "dir.h"
@ -556,7 +557,7 @@ remove_entry:
*/
char *dst_dup = xstrdup(dst);
string_list_append(&dirty_paths, dst);
safe_create_leading_directories(dst_dup);
safe_create_leading_directories(the_repository, dst_dup);
FREE_AND_NULL(dst_dup);
rename(src, dst);
}

3
builtin/notes.c
View File

@ -14,8 +14,9 @@
#include "gettext.h"
#include "hex.h"
#include "notes.h"
#include "object-file.h"
#include "object-name.h"
#include "object-store-ll.h"
#include "object-store.h"
#include "path.h"

#include "pretty.h"

2
builtin/pack-objects.c
View File

@ -32,7 +32,7 @@
#include "list.h"
#include "packfile.h"
#include "object-file.h"
#include "object-store-ll.h"
#include "object-store.h"
#include "replace-object.h"
#include "dir.h"
#include "midx.h"

2
builtin/pack-redundant.c
View File

@ -13,7 +13,7 @@
#include "hex.h"

#include "packfile.h"
#include "object-store-ll.h"
#include "object-store.h"
#include "strbuf.h"

#define BLKSIZE 512

2
builtin/prune.c
View File

@ -17,7 +17,7 @@
#include "replace-object.h"
#include "object-file.h"
#include "object-name.h"
#include "object-store-ll.h"
#include "object-store.h"
#include "shallow.h"

static const char * const prune_usage[] = {

3
builtin/rebase.c
View File

@ -267,7 +267,8 @@ static int init_basic_state(struct replay_opts *opts, const char *head_name,
{
FILE *interactive;

if (!is_directory(merge_dir()) && mkdir_in_gitdir(merge_dir()))
if (!is_directory(merge_dir()) &&
safe_create_dir_in_gitdir(the_repository, merge_dir()))
return error_errno(_("could not create temporary %s"), merge_dir());

refs_delete_reflog(get_main_ref_store(the_repository), "REBASE_HEAD");

3
builtin/receive-pack.c
View File

@ -31,8 +31,9 @@
#include "tmp-objdir.h"
#include "oidset.h"
#include "packfile.h"
#include "object-file.h"
#include "object-name.h"
#include "object-store-ll.h"
#include "object-store.h"
#include "path.h"
#include "protocol.h"
#include "commit-reach.h"

2
builtin/remote.c
View File

@ -14,7 +14,7 @@
#include "rebase.h"
#include "refs.h"
#include "refspec.h"
#include "object-store-ll.h"
#include "object-store.h"
#include "strvec.h"
#include "commit-reach.h"
#include "progress.h"

2
builtin/repack.c
View File

@ -17,7 +17,7 @@
#include "midx.h"
#include "packfile.h"
#include "prune-packed.h"
#include "object-store-ll.h"
#include "object-store.h"
#include "promisor-remote.h"
#include "shallow.h"
#include "pack.h"

4
builtin/replace.c
View File

@ -19,7 +19,7 @@
#include "run-command.h"
#include "object-file.h"
#include "object-name.h"
#include "object-store-ll.h"
#include "object-store.h"
#include "replace-object.h"
#include "tag.h"
#include "wildmatch.h"
@ -305,7 +305,7 @@ static int import_object(struct object_id *oid, enum object_type type,
strbuf_release(&result);
} else {
struct stat st;
int flags = HASH_FORMAT_CHECK | HASH_WRITE_OBJECT;
int flags = INDEX_FORMAT_CHECK | INDEX_WRITE_OBJECT;

if (fstat(fd, &st) < 0) {
error_errno(_("unable to fstat %s"), filename);

2
builtin/rev-list.c
View File

@ -14,7 +14,7 @@
#include "object.h"
#include "object-name.h"
#include "object-file.h"
#include "object-store-ll.h"
#include "object-store.h"
#include "pack-bitmap.h"
#include "parse-options.h"
#include "log-tree.h"

2
builtin/show-ref.c
View File

@ -5,7 +5,7 @@
#include "hex.h"
#include "refs/refs-internal.h"
#include "object-name.h"
#include "object-store-ll.h"
#include "object-store.h"
#include "object.h"
#include "string-list.h"
#include "parse-options.h"

5
builtin/sparse-checkout.c
View File

@ -9,6 +9,7 @@
#include "object-file.h"
#include "object-name.h"
#include "parse-options.h"
#include "path.h"
#include "pathspec.h"
#include "strbuf.h"
#include "string-list.h"
@ -335,7 +336,7 @@ static int write_patterns_and_update(struct pattern_list *pl)

sparse_filename = get_sparse_checkout_filename();

if (safe_create_leading_directories(sparse_filename))
if (safe_create_leading_directories(the_repository, sparse_filename))
die(_("failed to create directory for sparse-checkout file"));

hold_lock_file_for_update(&lk, sparse_filename, LOCK_DIE_ON_ERROR);
@ -491,7 +492,7 @@ static int sparse_checkout_init(int argc, const char **argv, const char *prefix,
FILE *fp;

/* assume we are in a fresh repo, but update the sparse-checkout file */
if (safe_create_leading_directories(sparse_filename))
if (safe_create_leading_directories(the_repository, sparse_filename))
die(_("unable to create leading directories of %s"),
sparse_filename);
fp = xfopen(sparse_filename, "w");

6
builtin/submodule--helper.c
View File

@ -28,7 +28,7 @@
#include "diff.h"
#include "object-file.h"
#include "object-name.h"
#include "object-store-ll.h"
#include "object-store.h"
#include "advice.h"
#include "branch.h"
#include "list-objects-filter-options.h"
@ -1739,7 +1739,7 @@ static int clone_submodule(const struct module_clone_data *clone_data,
!is_empty_dir(clone_data_path))
die(_("directory not empty: '%s'"), clone_data_path);

if (safe_create_leading_directories_const(sm_gitdir) < 0)
if (safe_create_leading_directories_const(the_repository, sm_gitdir) < 0)
die(_("could not create directory '%s'"), sm_gitdir);

prepare_possible_alternates(clone_data->name, reference);
@ -1800,7 +1800,7 @@ static int clone_submodule(const struct module_clone_data *clone_data,
if (clone_data->require_init && !stat(clone_data_path, &st) &&
!is_empty_dir(clone_data_path))
die(_("directory not empty: '%s'"), clone_data_path);
if (safe_create_leading_directories_const(clone_data_path) < 0)
if (safe_create_leading_directories_const(the_repository, clone_data_path) < 0)
die(_("could not create directory '%s'"), clone_data_path);
path = xstrfmt("%s/index", sm_gitdir);
unlink_or_warn(path);

3
builtin/tag.c
View File

@ -17,8 +17,9 @@
#include "gettext.h"
#include "hex.h"
#include "refs.h"
#include "object-file.h"
#include "object-name.h"
#include "object-store-ll.h"
#include "object-store.h"
#include "path.h"
#include "tag.h"
#include "parse-options.h"

3
builtin/unpack-file.c
View File

@ -2,8 +2,9 @@
#include "builtin.h"
#include "config.h"
#include "hex.h"
#include "object-file.h"
#include "object-name.h"
#include "object-store-ll.h"
#include "object-store.h"

static char *create_temp_file(struct object_id *oid)
{

3
builtin/unpack-objects.c
View File

@ -8,7 +8,8 @@
#include "gettext.h"
#include "git-zlib.h"
#include "hex.h"
#include "object-store-ll.h"
#include "object-file.h"
#include "object-store.h"
#include "object.h"
#include "delta.h"
#include "pack.h"

2
builtin/update-index.c
View File

@ -304,7 +304,7 @@ static int add_one_path(const struct cache_entry *old, const char *path, int len
ce->ce_mode = ce_mode_from_stat(old, st->st_mode);

if (index_path(the_repository->index, &ce->oid, path, st,
info_only ? 0 : HASH_WRITE_OBJECT)) {
info_only ? 0 : INDEX_WRITE_OBJECT)) {
discard_cache_entry(ce);
return -1;
}

8
builtin/worktree.c
View File

@ -348,7 +348,7 @@ static void copy_sparse_checkout(const char *worktree_git_dir)
char *to_file = xstrfmt("%s/info/sparse-checkout", worktree_git_dir);

if (file_exists(from_file)) {
if (safe_create_leading_directories(to_file) ||
if (safe_create_leading_directories(the_repository, to_file) ||
copy_file(to_file, from_file, 0666))
error(_("failed to copy '%s' to '%s'; sparse-checkout may not work correctly"),
from_file, to_file);
@ -367,7 +367,7 @@ static void copy_filtered_worktree_config(const char *worktree_git_dir)
struct config_set cs = { { 0 } };
int bare;

if (safe_create_leading_directories(to_file) ||
if (safe_create_leading_directories(the_repository, to_file) ||
copy_file(to_file, from_file, 0666)) {
error(_("failed to copy worktree config from '%s' to '%s'"),
from_file, to_file);
@ -466,7 +466,7 @@ static int add_worktree(const char *path, const char *refname,
name = sb_name.buf;
repo_git_path_replace(the_repository, &sb_repo, "worktrees/%s", name);
len = sb_repo.len;
if (safe_create_leading_directories_const(sb_repo.buf))
if (safe_create_leading_directories_const(the_repository, sb_repo.buf))
die_errno(_("could not create leading directories of '%s'"),
sb_repo.buf);

@ -498,7 +498,7 @@ static int add_worktree(const char *path, const char *refname,
write_file(sb.buf, _("initializing"));

strbuf_addf(&sb_git, "%s/.git", path);
if (safe_create_leading_directories_const(sb_git.buf))
if (safe_create_leading_directories_const(the_repository, sb_git.buf))
die_errno(_("could not create leading directories of '%s'"),
sb_git.buf);
junk_work_tree = xstrdup(path);

8
bulk-checkin.c
View File

@ -17,7 +17,7 @@
#include "tmp-objdir.h"
#include "packfile.h"
#include "object-file.h"
#include "object-store-ll.h"
#include "object-store.h"

static int odb_transaction_nesting;

@ -167,7 +167,7 @@ static int stream_blob_to_pack(struct bulk_checkin_packfile *state,
unsigned char obuf[16384];
unsigned hdrlen;
int status = Z_OK;
int write_object = (flags & HASH_WRITE_OBJECT);
int write_object = (flags & INDEX_WRITE_OBJECT);
off_t offset = 0;

git_deflate_init(&s, pack_compression_level);
@ -237,7 +237,7 @@ static int stream_blob_to_pack(struct bulk_checkin_packfile *state,
static void prepare_to_stream(struct bulk_checkin_packfile *state,
unsigned flags)
{
if (!(flags & HASH_WRITE_OBJECT) || state->f)
if (!(flags & INDEX_WRITE_OBJECT) || state->f)
return;

state->f = create_tmp_packfile(the_repository, &state->pack_tmp_name);
@ -271,7 +271,7 @@ static int deflate_blob_to_pack(struct bulk_checkin_packfile *state,
git_hash_update(&ctx, obuf, header_len);

/* Note: idx is non-NULL when we are writing */
if ((flags & HASH_WRITE_OBJECT) != 0) {
if ((flags & INDEX_WRITE_OBJECT) != 0) {
CALLOC_ARRAY(idx, 1);

prepare_to_stream(state, flags);

15
bulk-checkin.h
View File

@ -9,6 +9,21 @@
void prepare_loose_object_bulk_checkin(void);
void fsync_loose_object_bulk_checkin(int fd, const char *filename);

/*
* This creates one packfile per large blob unless bulk-checkin
* machinery is "plugged".
*
* This also bypasses the usual "convert-to-git" dance, and that is on
* purpose. We could write a streaming version of the converting
* functions and insert that before feeding the data to fast-import
* (or equivalent in-core API described above). However, that is
* somewhat complicated, as we do not know the size of the filter
* result, which we need to know beforehand when writing a git object.
* Since the primary motivation for trying to stream from the working
* tree file and to avoid mmaping it in core is to deal with large
* binary blobs, they generally do not want to get any conversion, and
* callers should avoid this code path when filters are requested.
*/
int index_blob_bulk_checkin(struct object_id *oid,
int fd, size_t size,
const char *path, unsigned flags);

2
bundle-uri.c
View File

@ -14,7 +14,7 @@
#include "fetch-pack.h"
#include "remote.h"
#include "trace2.h"
#include "object-store-ll.h"
#include "object-store.h"

static struct {
enum bundle_list_heuristic heuristic;

2
bundle.c
View File

@ -7,7 +7,7 @@
#include "environment.h"
#include "gettext.h"
#include "hex.h"
#include "object-store-ll.h"
#include "object-store.h"
#include "repository.h"
#include "object.h"
#include "commit.h"

4
cache-tree.c
View File

@ -10,7 +10,7 @@
#include "cache-tree.h"
#include "bulk-checkin.h"
#include "object-file.h"
#include "object-store-ll.h"
#include "object-store.h"
#include "read-cache-ll.h"
#include "replace-object.h"
#include "repository.h"
@ -452,7 +452,7 @@ static int update_one(struct cache_tree *it,
OBJ_TREE, &it->oid);
} else if (write_object_file_flags(buffer.buf, buffer.len, OBJ_TREE,
&it->oid, NULL, flags & WRITE_TREE_SILENT
? HASH_SILENT : 0)) {
? WRITE_OBJECT_FILE_SILENT : 0)) {
strbuf_release(&buffer);
return -1;
}

2
combine-diff.c
View File

@ -2,7 +2,7 @@
#define DISABLE_SIGN_COMPARE_WARNINGS

#include "git-compat-util.h"
#include "object-store-ll.h"
#include "object-store.h"
#include "commit.h"
#include "convert.h"
#include "diff.h"

5
commit-graph.c
View File

@ -13,8 +13,7 @@
#include "refs.h"
#include "hash-lookup.h"
#include "commit-graph.h"
#include "object-file.h"
#include "object-store-ll.h"
#include "object-store.h"
#include "oid-array.h"
#include "path.h"
#include "alloc.h"
@ -2065,7 +2064,7 @@ static int write_commit_graph_file(struct write_commit_graph_context *ctx)
ctx->graph_name = get_commit_graph_filename(ctx->odb);
}

if (safe_create_leading_directories(ctx->graph_name)) {
if (safe_create_leading_directories(the_repository, ctx->graph_name)) {
error(_("unable to create leading directories of %s"),
ctx->graph_name);
return -1;

2
commit-graph.h
View File

@ -1,7 +1,7 @@
#ifndef COMMIT_GRAPH_H
#define COMMIT_GRAPH_H

#include "object-store-ll.h"
#include "object-store.h"
#include "oidset.h"

#define GIT_TEST_COMMIT_GRAPH "GIT_TEST_COMMIT_GRAPH"

3
commit.c
View File

@ -9,7 +9,7 @@
#include "hex.h"
#include "repository.h"
#include "object-name.h"
#include "object-store-ll.h"
#include "object-store.h"
#include "utf8.h"
#include "diff.h"
#include "revision.h"
@ -29,6 +29,7 @@
#include "tree.h"
#include "hook.h"
#include "parse.h"
#include "object-file.h"
#include "object-file-convert.h"

static struct commit_extra_header *read_commit_extra_header_lines(const char *buf, size_t len, const char **);

29
compat/open.c
View File

@ -1,5 +1,6 @@
#include "git-compat-util.h"

#ifdef OPEN_RETURNS_EINTR
#undef open
int git_open_with_retry(const char *path, int flags, ...)
{
@ -23,3 +24,31 @@ int git_open_with_retry(const char *path, int flags, ...)

return ret;
}
#endif

int git_open_cloexec(const char *name, int flags)
{
int fd;
static int o_cloexec = O_CLOEXEC;

fd = open(name, flags | o_cloexec);
if ((o_cloexec & O_CLOEXEC) && fd < 0 && errno == EINVAL) {
/* Try again w/o O_CLOEXEC: the kernel might not support it */
o_cloexec &= ~O_CLOEXEC;
fd = open(name, flags | o_cloexec);
}

#if defined(F_GETFD) && defined(F_SETFD) && defined(FD_CLOEXEC)
{
static int fd_cloexec = FD_CLOEXEC;

if (!o_cloexec && 0 <= fd && fd_cloexec) {
/* Opened w/o O_CLOEXEC? try with fcntl(2) to add it */
int flags = fcntl(fd, F_GETFD);
if (fcntl(fd, F_SETFD, flags | fd_cloexec))
fd_cloexec = 0;
}
}
#endif
return fd;
}

2
config.c
View File

@ -31,7 +31,7 @@
#include "hashmap.h"
#include "string-list.h"
#include "object-name.h"
#include "object-store-ll.h"
#include "object-store.h"
#include "pager.h"
#include "path.h"
#include "utf8.h"

2
connected.c
View File

@ -3,7 +3,7 @@
#include "git-compat-util.h"
#include "gettext.h"
#include "hex.h"
#include "object-store-ll.h"
#include "object-store.h"
#include "run-command.h"
#include "sigchain.h"
#include "connected.h"

2
convert.c
View File

@ -8,7 +8,7 @@
#include "copy.h"
#include "gettext.h"
#include "hex.h"
#include "object-store-ll.h"
#include "object-store.h"
#include "attr.h"
#include "run-command.h"
#include "quote.h"

2
diagnose.c
View File

@ -7,7 +7,7 @@
#include "gettext.h"
#include "hex.h"
#include "strvec.h"
#include "object-store-ll.h"
#include "object-store.h"
#include "packfile.h"
#include "parse-options.h"
#include "repository.h"

2
diff.c
View File

@ -23,7 +23,7 @@
#include "color.h"
#include "run-command.h"
#include "utf8.h"
#include "object-store-ll.h"
#include "object-store.h"
#include "userdiff.h"
#include "submodule.h"
#include "hashmap.h"

2
diffcore-rename.c
View File

@ -8,7 +8,7 @@
#include "git-compat-util.h"
#include "diff.h"
#include "diffcore.h"
#include "object-store-ll.h"
#include "object-store.h"
#include "hashmap.h"
#include "mem-pool.h"
#include "oid-array.h"

7
dir.c
View File

@ -17,8 +17,7 @@
#include "environment.h"
#include "gettext.h"
#include "name-hash.h"
#include "object-file.h"
#include "object-store-ll.h"
#include "object-store.h"
#include "path.h"
#include "refs.h"
#include "repository.h"
@ -4063,12 +4062,12 @@ void connect_work_tree_and_git_dir(const char *work_tree_,

/* Prepare .git file */
strbuf_addf(&gitfile_sb, "%s/.git", work_tree_);
if (safe_create_leading_directories_const(gitfile_sb.buf))
if (safe_create_leading_directories_const(the_repository, gitfile_sb.buf))
die(_("could not create directories for %s"), gitfile_sb.buf);

/* Prepare config file */
strbuf_addf(&cfg_sb, "%s/config", git_dir_);
if (safe_create_leading_directories_const(cfg_sb.buf))
if (safe_create_leading_directories_const(the_repository, cfg_sb.buf))
die(_("could not create directories for %s"), cfg_sb.buf);

git_dir = real_pathdup(git_dir_, 1);

2
entry.c
View File

@ -1,7 +1,7 @@
#define USE_THE_REPOSITORY_VARIABLE

#include "git-compat-util.h"
#include "object-store-ll.h"
#include "object-store.h"
#include "dir.h"
#include "environment.h"
#include "gettext.h"

2
fetch-pack.c
View File

@ -24,7 +24,7 @@
#include "oid-array.h"
#include "oidset.h"
#include "packfile.h"
#include "object-store-ll.h"
#include "object-store.h"
#include "path.h"
#include "connected.h"
#include "fetch-negotiator.h"

2
fmt-merge-msg.c
View File

@ -6,7 +6,7 @@
#include "environment.h"
#include "refs.h"
#include "object-name.h"
#include "object-store-ll.h"
#include "object-store.h"
#include "diff.h"
#include "diff-merges.h"
#include "hex.h"

2
fsck.c
View File

@ -4,7 +4,7 @@
#include "date.h"
#include "dir.h"
#include "hex.h"
#include "object-store-ll.h"
#include "object-store.h"
#include "path.h"
#include "repository.h"
#include "object.h"

3
git-compat-util.h
View File

@ -598,6 +598,9 @@ static inline bool strip_suffix(const char *str, const char *suffix,
#define DEFAULT_PACKED_GIT_LIMIT \
((1024L * 1024L) * (size_t)(sizeof(void*) >= 8 ? (32 * 1024L * 1024L) : 256))

int git_open_cloexec(const char *name, int flags);
#define git_open(name) git_open_cloexec(name, O_RDONLY)

static inline size_t st_add(size_t a, size_t b)
{
if (unsigned_add_overflows(a, b))

2
grep.c
View File

@ -5,7 +5,7 @@
#include "gettext.h"
#include "grep.h"
#include "hex.h"
#include "object-store-ll.h"
#include "object-store.h"
#include "pretty.h"
#include "userdiff.h"
#include "xdiff-interface.h"

2
http-backend.c
View File

@ -18,7 +18,7 @@
#include "url.h"
#include "strvec.h"
#include "packfile.h"
#include "object-store-ll.h"
#include "object-store.h"
#include "protocol.h"
#include "date.h"
#include "write-or-die.h"

3
http-push.c
View File

@ -19,7 +19,8 @@
#include "tree-walk.h"
#include "url.h"
#include "packfile.h"
#include "object-store-ll.h"
#include "object-file.h"
#include "object-store.h"
#include "commit-reach.h"

#ifdef EXPAT_NEEDS_XMLPARSE_H

2
http-walker.c
View File

@ -9,7 +9,7 @@
#include "list.h"
#include "transport.h"
#include "packfile.h"
#include "object-store-ll.h"
#include "object-store.h"

struct alt_base {
char *base;

2
http.c
View File

@ -19,7 +19,7 @@
#include "packfile.h"
#include "string-list.h"
#include "object-file.h"
#include "object-store-ll.h"
#include "object-store.h"
#include "tempfile.h"

static struct trace_key trace_curl = TRACE_KEY_INIT(CURL);

2
list-objects-filter.c
View File

@ -12,7 +12,7 @@
#include "oidmap.h"
#include "oidset.h"
#include "object-name.h"
#include "object-store-ll.h"
#include "object-store.h"

/* Remember to update object flag allocation in object.h */
/*

2
list-objects.c
View File

@ -14,7 +14,7 @@
#include "list-objects-filter.h"
#include "list-objects-filter-options.h"
#include "packfile.h"
#include "object-store-ll.h"
#include "object-store.h"
#include "trace.h"
#include "environment.h"


2
log-tree.c
View File

@ -9,7 +9,7 @@
#include "environment.h"
#include "hex.h"
#include "object-name.h"
#include "object-store-ll.h"
#include "object-store.h"
#include "repository.h"
#include "tmp-objdir.h"
#include "commit.h"

2
mailmap.c
View File

@ -6,7 +6,7 @@
#include "string-list.h"
#include "mailmap.h"
#include "object-name.h"
#include "object-store-ll.h"
#include "object-store.h"
#include "setup.h"

char *git_mailmap_file;

3
match-trees.c
View File

@ -6,7 +6,8 @@
#include "strbuf.h"
#include "tree.h"
#include "tree-walk.h"
#include "object-store-ll.h"
#include "object-file.h"
#include "object-store.h"
#include "repository.h"

static int score_missing(unsigned mode)

2
merge-blobs.c
View File

@ -4,7 +4,7 @@
#include "merge-ll.h"
#include "blob.h"
#include "merge-blobs.h"
#include "object-store-ll.h"
#include "object-store.h"

static int fill_mmfile_blob(mmfile_t *f, struct blob *obj)
{

3
merge-ort.c
View File

@ -37,8 +37,9 @@
#include "merge-ll.h"
#include "match-trees.h"
#include "mem-pool.h"
#include "object-file.h"
#include "object-name.h"
#include "object-store-ll.h"
#include "object-store.h"
#include "oid-array.h"
#include "path.h"
#include "promisor-remote.h"

2
meson.build
View File

@ -296,6 +296,7 @@ libgit_sources = [
'common-init.c',
'compat/nonblock.c',
'compat/obstack.c',
'compat/open.c',
'compat/terminal.c',
'compiler-tricks/not-constant.c',
'config.c',
@ -386,6 +387,7 @@ libgit_sources = [
'object-file-convert.c',
'object-file.c',
'object-name.c',
'object-store.c',
'object.c',
'oid-array.c',
'oidmap.c',

2
midx-write.c
View File

@ -1098,7 +1098,7 @@ static int write_midx_internal(struct repository *r, const char *object_dir,
object_dir);
else
get_midx_filename(r->hash_algo, &midx_name, object_dir);
if (safe_create_leading_directories(midx_name.buf))
if (safe_create_leading_directories(r, midx_name.buf))
die_errno(_("unable to create leading directories of %s"),
midx_name.buf);


1
midx.c
View File

@ -5,7 +5,6 @@
#include "dir.h"
#include "hex.h"
#include "packfile.h"
#include "object-file.h"
#include "hash-lookup.h"
#include "midx.h"
#include "progress.h"

3
notes-cache.c
View File

@ -2,7 +2,8 @@

#include "git-compat-util.h"
#include "notes-cache.h"
#include "object-store-ll.h"
#include "object-file.h"
#include "object-store.h"
#include "pretty.h"
#include "repository.h"
#include "commit.h"

8
notes-merge.c
View File

@ -8,7 +8,7 @@
#include "refs.h"
#include "object-file.h"
#include "object-name.h"
#include "object-store-ll.h"
#include "object-store.h"
#include "path.h"
#include "repository.h"
#include "diff.h"
@ -296,7 +296,7 @@ static void check_notes_merge_worktree(struct notes_merge_options *o)
"(%s exists)."), repo_git_path_replace(the_repository, &buf, "NOTES_MERGE_*"));
}

if (safe_create_leading_directories_const(repo_git_path_replace(the_repository, &buf,
if (safe_create_leading_directories_const(the_repository, repo_git_path_replace(the_repository, &buf,
NOTES_MERGE_WORKTREE "/.test")))
die_errno("unable to create directory %s",
repo_git_path_replace(the_repository, &buf, NOTES_MERGE_WORKTREE));
@ -314,7 +314,7 @@ static void write_buf_to_worktree(const struct object_id *obj,
{
int fd;
char *path = repo_git_path(the_repository, NOTES_MERGE_WORKTREE "/%s", oid_to_hex(obj));
if (safe_create_leading_directories_const(path))
if (safe_create_leading_directories_const(the_repository, path))
die_errno("unable to create directory for '%s'", path);

fd = xopen(path, O_WRONLY | O_EXCL | O_CREAT, 0666);
@ -729,7 +729,7 @@ int notes_merge_commit(struct notes_merge_options *o,
/* write file as blob, and add to partial_tree */
if (stat(path.buf, &st))
die_errno("Failed to stat '%s'", path.buf);
if (index_path(o->repo->index, &blob_oid, path.buf, &st, HASH_WRITE_OBJECT))
if (index_path(o->repo->index, &blob_oid, path.buf, &st, INDEX_WRITE_OBJECT))
die("Failed to write blob object from '%s'", path.buf);
if (add_note(partial_tree, &obj_oid, &blob_oid, NULL))
die("Failed to add resolved note '%s' to notes tree",

3
notes.c
View File

@ -6,8 +6,9 @@
#include "environment.h"
#include "hex.h"
#include "notes.h"
#include "object-file.h"
#include "object-name.h"
#include "object-store-ll.h"
#include "object-store.h"
#include "utf8.h"
#include "strbuf.h"
#include "tree-walk.h"

1220
object-file.c
View File

File diff suppressed because it is too large Load Diff

121
object-file.h
View File

@ -14,50 +14,37 @@ struct index_state;
*/
extern int fetch_if_missing;

#define HASH_WRITE_OBJECT 1
#define HASH_FORMAT_CHECK 2
#define HASH_RENORMALIZE 4
#define HASH_SILENT 8
enum {
INDEX_WRITE_OBJECT = (1 << 0),
INDEX_FORMAT_CHECK = (1 << 1),
INDEX_RENORMALIZE = (1 << 2),
};

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);

struct object_directory;

const char *odb_loose_path(struct object_directory *odb,
struct strbuf *buf,
const struct object_id *oid);

/*
* Create the directory containing the named path, using care to be
* somewhat safe against races. Return one of the scld_error values to
* indicate success/failure. On error, set errno to describe the
* problem.
*
* SCLD_VANISHED indicates that one of the ancestor directories of the
* path existed at one point during the function call and then
* suddenly vanished, probably because another process pruned the
* directory while we were working. To be robust against this kind of
* race, callers might want to try invoking the function again when it
* returns SCLD_VANISHED.
*
* safe_create_leading_directories() temporarily changes path while it
* is working but restores it before returning.
* safe_create_leading_directories_const() doesn't modify path, even
* temporarily. Both these variants adjust the permissions of the
* created directories to honor core.sharedRepository, so they are best
* suited for files inside the git dir. For working tree files, use
* safe_create_leading_directories_no_share() instead, as it ignores
* the core.sharedRepository setting.
* Return true iff an alternate object database has a loose object
* with the specified name. This function does not respect replace
* references.
*/
enum scld_error {
SCLD_OK = 0,
SCLD_FAILED = -1,
SCLD_PERMS = -2,
SCLD_EXISTS = -3,
SCLD_VANISHED = -4
};
enum scld_error safe_create_leading_directories(char *path);
enum scld_error safe_create_leading_directories_const(const char *path);
enum scld_error safe_create_leading_directories_no_share(char *path);
int has_loose_object_nonlocal(const struct object_id *);

int mkdir_in_gitdir(const char *path);
int has_loose_object(const struct object_id *);

int git_open_cloexec(const char *name, int flags);
#define git_open(name) git_open_cloexec(name, O_RDONLY)
/**
* format_object_header() is a thin wrapper around s xsnprintf() that
* writes the initial "<type> <obj-len>" part of the loose object
* header. It returns the size that snprintf() returns + 1.
*/
int format_object_header(char *str, size_t size, enum object_type type,
size_t objsize);

/**
* unpack_loose_header() initializes the data stream needed to unpack
@ -99,6 +86,44 @@ enum unpack_loose_header_result unpack_loose_header(git_zstream *stream,
struct object_info;
int parse_loose_header(const char *hdr, struct object_info *oi);

enum {
/*
* By default, `write_object_file_literally()` does not actually write
* anything into the object store, but only computes the object ID.
* This flag changes that so that the object will be written as a loose
* object and persisted.
*/
WRITE_OBJECT_FILE_PERSIST = (1 << 0),

/*
* Do not print an error in case something gose wrong.
*/
WRITE_OBJECT_FILE_SILENT = (1 << 1),
};

int write_object_file_flags(const void *buf, unsigned long len,
enum object_type type, struct object_id *oid,
struct object_id *comapt_oid_in, unsigned flags);
static inline int write_object_file(const void *buf, unsigned long len,
enum object_type type, struct object_id *oid)
{
return write_object_file_flags(buf, len, type, oid, NULL, 0);
}

struct input_stream {
const void *(*read)(struct input_stream *, unsigned long *len);
void *data;
int is_finished;
};

int write_object_file_literally(const void *buf, unsigned long len,
const char *type, struct object_id *oid,
unsigned flags);
int stream_loose_object(struct input_stream *in_stream, size_t len,
struct object_id *oid);

int force_object_loose(const struct object_id *oid, time_t mtime);

/**
* With in-core object data in "buf", rehash it to make sure the
* object name actually matches "oid" to detect object corruption.
@ -117,6 +142,10 @@ int check_object_signature(struct repository *r, const struct object_id *oid,
*/
int stream_object_signature(struct repository *r, const struct object_id *oid);

int loose_object_info(struct repository *r,
const struct object_id *oid,
struct object_info *oi, int flags);

enum finalize_object_file_flags {
FOF_SKIP_COLLISION_CHECK = 1,
};
@ -128,10 +157,18 @@ int finalize_object_file_flags(const char *tmpfile, const char *filename,
/* Helper to check and "touch" a file */
int check_and_freshen_file(const char *fn, int freshen);

void *read_object_with_reference(struct repository *r,
const struct object_id *oid,
enum object_type required_type,
unsigned long *size,
struct object_id *oid_ret);
/*
* Open the loose object at path, check its hash, and return the contents,
* use the "oi" argument to assert things about the object, or e.g. populate its
* type, and size. If the object is a blob, then "contents" may return NULL,
* to allow streaming of large blobs.
*
* Returns 0 on success, negative on error (details may be written to stderr).
*/
int read_loose_object(const char *path,
const struct object_id *expected_oid,
struct object_id *real_oid,
void **contents,
struct object_info *oi);

#endif /* OBJECT_FILE_H */

2
object-name.c
View File

@ -19,7 +19,7 @@
#include "oidtree.h"
#include "packfile.h"
#include "pretty.h"
#include "object-store-ll.h"
#include "object-store.h"
#include "read-cache-ll.h"
#include "repo-settings.h"
#include "repository.h"

556
object-store-ll.h
View File

@ -1,556 +0,0 @@
#ifndef OBJECT_STORE_LL_H
#define OBJECT_STORE_LL_H

#include "hashmap.h"
#include "object.h"
#include "list.h"
#include "thread-utils.h"
#include "oidset.h"

struct oidmap;
struct oidtree;
struct strbuf;
struct repository;

struct object_directory {
struct object_directory *next;

/*
* Used to store the results of readdir(3) calls when we are OK
* sacrificing accuracy due to races for speed. That includes
* object existence with OBJECT_INFO_QUICK, as well as
* our search for unique abbreviated hashes. Don't use it for tasks
* requiring greater accuracy!
*
* Be sure to call odb_load_loose_cache() before using.
*/
uint32_t loose_objects_subdir_seen[8]; /* 256 bits */
struct oidtree *loose_objects_cache;

/* Map between object IDs for loose objects. */
struct loose_object_map *loose_map;

/*
* This is a temporary object store created by the tmp_objdir
* facility. Disable ref updates since the objects in the store
* might be discarded on rollback.
*/
int disable_ref_updates;

/*
* This object store is ephemeral, so there is no need to fsync.
*/
int will_destroy;

/*
* Path to the alternative object store. If this is a relative path,
* it is relative to the current working directory.
*/
char *path;
};

struct input_stream {
const void *(*read)(struct input_stream *, unsigned long *len);
void *data;
int is_finished;
};

void prepare_alt_odb(struct repository *r);
int has_alt_odb(struct repository *r);
char *compute_alternate_path(const char *path, struct strbuf *err);
struct object_directory *find_odb(struct repository *r, const char *obj_dir);
typedef int alt_odb_fn(struct object_directory *, void *);
int foreach_alt_odb(alt_odb_fn, void*);
typedef void alternate_ref_fn(const struct object_id *oid, void *);
void for_each_alternate_ref(alternate_ref_fn, void *);

/*
* Add the directory to the on-disk alternates file; the new entry will also
* take effect in the current process.
*/
void add_to_alternates_file(const char *dir);

/*
* Add the directory to the in-memory list of alternates (along with any
* recursive alternates it points to), but do not modify the on-disk alternates
* file.
*/
void add_to_alternates_memory(const char *dir);

/*
* Replace the current writable object directory with the specified temporary
* object directory; returns the former primary object directory.
*/
struct object_directory *set_temporary_primary_odb(const char *dir, int will_destroy);

/*
* Restore a previous ODB replaced by set_temporary_main_odb.
*/
void restore_primary_odb(struct object_directory *restore_odb, const char *old_path);

/*
* Populate and return the loose object cache array corresponding to the
* given object ID.
*/
struct oidtree *odb_loose_cache(struct object_directory *odb,
const struct object_id *oid);

/* Empty the loose object cache for the specified object directory. */
void odb_clear_loose_cache(struct object_directory *odb);

/* Clear and free the specified object directory */
void free_object_directory(struct object_directory *odb);

struct packed_git {
struct hashmap_entry packmap_ent;
struct packed_git *next;
struct list_head mru;
struct pack_window *windows;
off_t pack_size;
const void *index_data;
size_t index_size;
uint32_t num_objects;
size_t crc_offset;
struct oidset bad_objects;
int index_version;
time_t mtime;
int pack_fd;
int index; /* for builtin/pack-objects.c */
unsigned pack_local:1,
pack_keep:1,
pack_keep_in_core:1,
freshened:1,
do_not_close:1,
pack_promisor:1,
multi_pack_index:1,
is_cruft:1;
unsigned char hash[GIT_MAX_RAWSZ];
struct revindex_entry *revindex;
const uint32_t *revindex_data;
const uint32_t *revindex_map;
size_t revindex_size;
/*
* mtimes_map points at the beginning of the memory mapped region of
* this pack's corresponding .mtimes file, and mtimes_size is the size
* of that .mtimes file
*/
const uint32_t *mtimes_map;
size_t mtimes_size;

/* repo denotes the repository this packfile belongs to */
struct repository *repo;

/* something like ".git/objects/pack/xxxxx.pack" */
char pack_name[FLEX_ARRAY]; /* more */
};

struct multi_pack_index;

static inline int pack_map_entry_cmp(const void *cmp_data UNUSED,
const struct hashmap_entry *entry,
const struct hashmap_entry *entry2,
const void *keydata)
{
const char *key = keydata;
const struct packed_git *pg1, *pg2;

pg1 = container_of(entry, const struct packed_git, packmap_ent);
pg2 = container_of(entry2, const struct packed_git, packmap_ent);

return strcmp(pg1->pack_name, key ? key : pg2->pack_name);
}

struct raw_object_store {
/*
* Set of all object directories; the main directory is first (and
* cannot be NULL after initialization). Subsequent directories are
* alternates.
*/
struct object_directory *odb;
struct object_directory **odb_tail;
struct kh_odb_path_map *odb_by_path;

int loaded_alternates;

/*
* A list of alternate object directories loaded from the environment;
* this should not generally need to be accessed directly, but will
* populate the "odb" list when prepare_alt_odb() is run.
*/
char *alternate_db;

/*
* Objects that should be substituted by other objects
* (see git-replace(1)).
*/
struct oidmap *replace_map;
unsigned replace_map_initialized : 1;
pthread_mutex_t replace_mutex; /* protect object replace functions */

struct commit_graph *commit_graph;
unsigned commit_graph_attempted : 1; /* if loading has been attempted */

/*
* private data
*
* should only be accessed directly by packfile.c and midx.c
*/
struct multi_pack_index *multi_pack_index;

/*
* private data
*
* should only be accessed directly by packfile.c
*/

struct packed_git *packed_git;
/* A most-recently-used ordered version of the packed_git list. */
struct list_head packed_git_mru;

struct {
struct packed_git **packs;
unsigned flags;
} kept_pack_cache;

/*
* A map of packfiles to packed_git structs for tracking which
* packs have been loaded already.
*/
struct hashmap pack_map;

/*
* A fast, rough count of the number of objects in the repository.
* These two fields are not meant for direct access. Use
* repo_approximate_object_count() instead.
*/
unsigned long approximate_object_count;
unsigned approximate_object_count_valid : 1;

/*
* Whether packed_git has already been populated with this repository's
* packs.
*/
unsigned packed_git_initialized : 1;
};

struct raw_object_store *raw_object_store_new(void);
void raw_object_store_clear(struct raw_object_store *o);

/*
* Create a temporary file rooted in the object database directory, or
* die on failure. The filename is taken from "pattern", which should have the
* usual "XXXXXX" trailer, and the resulting filename is written into the
* "template" buffer. Returns the open descriptor.
*/
int odb_mkstemp(struct strbuf *temp_filename, const char *pattern);

/*
* Create a pack .keep file named "name" (which should generally be the output
* of odb_pack_name). Returns a file descriptor opened for writing, or -1 on
* error.
*/
int odb_pack_keep(const char *name);

/*
* Put in `buf` the name of the file in the local object database that
* would be used to store a loose object with the specified oid.
*/
const char *loose_object_path(struct repository *r, struct strbuf *buf,
const struct object_id *oid);

void *map_loose_object(struct repository *r, const struct object_id *oid,
unsigned long *size);

void *repo_read_object_file(struct repository *r,
const struct object_id *oid,
enum object_type *type,
unsigned long *size);

/* Read and unpack an object file into memory, write memory to an object file */
int oid_object_info(struct repository *r, const struct object_id *, unsigned long *);

void hash_object_file(const struct git_hash_algo *algo, const void *buf,
unsigned long len, enum object_type type,
struct object_id *oid);

int write_object_file_flags(const void *buf, unsigned long len,
enum object_type type, struct object_id *oid,
struct object_id *comapt_oid_in, unsigned flags);
static inline int write_object_file(const void *buf, unsigned long len,
enum object_type type, struct object_id *oid)
{
return write_object_file_flags(buf, len, type, oid, NULL, 0);
}

int write_object_file_literally(const void *buf, unsigned long len,
const char *type, struct object_id *oid,
unsigned flags);
int stream_loose_object(struct input_stream *in_stream, size_t len,
struct object_id *oid);

/*
* Add an object file to the in-memory object store, without writing it
* to disk.
*
* Callers are responsible for calling write_object_file to record the
* object in persistent storage before writing any other new objects
* that reference it.
*/
int pretend_object_file(void *, unsigned long, enum object_type,
struct object_id *oid);

int force_object_loose(const struct object_id *oid, time_t mtime);

struct object_info {
/* Request */
enum object_type *typep;
unsigned long *sizep;
off_t *disk_sizep;
struct object_id *delta_base_oid;
struct strbuf *type_name;
void **contentp;

/* Response */
enum {
OI_CACHED,
OI_LOOSE,
OI_PACKED,
OI_DBCACHED
} whence;
union {
/*
* struct {
* ... Nothing to expose in this case
* } cached;
* struct {
* ... Nothing to expose in this case
* } loose;
*/
struct {
struct packed_git *pack;
off_t offset;
unsigned int is_delta;
} packed;
} u;
};

/*
* Initializer for a "struct object_info" that wants no items. You may
* also memset() the memory to all-zeroes.
*/
#define OBJECT_INFO_INIT { 0 }

/* Invoke lookup_replace_object() on the given hash */
#define OBJECT_INFO_LOOKUP_REPLACE 1
/* Allow reading from a loose object file of unknown/bogus type */
#define OBJECT_INFO_ALLOW_UNKNOWN_TYPE 2
/* Do not retry packed storage after checking packed and loose storage */
#define OBJECT_INFO_QUICK 8
/*
* Do not attempt to fetch the object if missing (even if fetch_is_missing is
* nonzero).
*/
#define OBJECT_INFO_SKIP_FETCH_OBJECT 16
/*
* This is meant for bulk prefetching of missing blobs in a partial
* clone. Implies OBJECT_INFO_SKIP_FETCH_OBJECT and OBJECT_INFO_QUICK
*/
#define OBJECT_INFO_FOR_PREFETCH (OBJECT_INFO_SKIP_FETCH_OBJECT | OBJECT_INFO_QUICK)

/* Die if object corruption (not just an object being missing) was detected. */
#define OBJECT_INFO_DIE_IF_CORRUPT 32

int oid_object_info_extended(struct repository *r,
const struct object_id *,
struct object_info *, unsigned flags);

/*
* Open the loose object at path, check its hash, and return the contents,
* use the "oi" argument to assert things about the object, or e.g. populate its
* type, and size. If the object is a blob, then "contents" may return NULL,
* to allow streaming of large blobs.
*
* Returns 0 on success, negative on error (details may be written to stderr).
*/
int read_loose_object(const char *path,
const struct object_id *expected_oid,
struct object_id *real_oid,
void **contents,
struct object_info *oi);

/* Retry packed storage after checking packed and loose storage */
#define HAS_OBJECT_RECHECK_PACKED 1

/*
* Returns 1 if the object exists. This function will not lazily fetch objects
* in a partial clone.
*/
int has_object(struct repository *r, const struct object_id *oid,
unsigned flags);

/*
* These macros and functions are deprecated. If checking existence for an
* object that is likely to be missing and/or whose absence is relatively
* inconsequential (or is consequential but the caller is prepared to handle
* it), use has_object(), which has better defaults (no lazy fetch in a partial
* clone and no rechecking of packed storage). In the unlikely event that a
* caller needs to assert existence of an object that it fully expects to
* exist, and wants to trigger a lazy fetch in a partial clone, use
* oid_object_info_extended() with a NULL struct object_info.
*
* These functions can be removed once all callers have migrated to
* has_object() and/or oid_object_info_extended().
*/
int repo_has_object_file(struct repository *r, const struct object_id *oid);
int repo_has_object_file_with_flags(struct repository *r,
const struct object_id *oid, int flags);

/*
* Return true iff an alternate object database has a loose object
* with the specified name. This function does not respect replace
* references.
*/
int has_loose_object_nonlocal(const struct object_id *);

int has_loose_object(const struct object_id *);

/**
* format_object_header() is a thin wrapper around s xsnprintf() that
* writes the initial "<type> <obj-len>" part of the loose object
* header. It returns the size that snprintf() returns + 1.
*/
int format_object_header(char *str, size_t size, enum object_type type,
size_t objsize);

void assert_oid_type(const struct object_id *oid, enum object_type expect);

/*
* Enabling the object read lock allows multiple threads to safely call the
* following functions in parallel: repo_read_object_file(),
* read_object_with_reference(), oid_object_info() and oid_object_info_extended().
*
* obj_read_lock() and obj_read_unlock() may also be used to protect other
* section which cannot execute in parallel with object reading. Since the used
* lock is a recursive mutex, these sections can even contain calls to object
* reading functions. However, beware that in these cases zlib inflation won't
* be performed in parallel, losing performance.
*
* TODO: oid_object_info_extended()'s call stack has a recursive behavior. If
* any of its callees end up calling it, this recursive call won't benefit from
* parallel inflation.
*/
void enable_obj_read_lock(void);
void disable_obj_read_lock(void);

extern int obj_read_use_lock;
extern pthread_mutex_t obj_read_mutex;

static inline void obj_read_lock(void)
{
if(obj_read_use_lock)
pthread_mutex_lock(&obj_read_mutex);
}

static inline void obj_read_unlock(void)
{
if(obj_read_use_lock)
pthread_mutex_unlock(&obj_read_mutex);
}

/*
* Iterate over the files in the loose-object parts of the object
* directory "path", triggering the following callbacks:
*
* - loose_object is called for each loose object we find.
*
* - loose_cruft is called for any files that do not appear to be
* loose objects. Note that we only look in the loose object
* directories "objects/[0-9a-f]{2}/", so we will not report
* "objects/foobar" as cruft.
*
* - loose_subdir is called for each top-level hashed subdirectory
* of the object directory (e.g., "$OBJDIR/f0"). It is called
* after the objects in the directory are processed.
*
* Any callback that is NULL will be ignored. Callbacks returning non-zero
* will end the iteration.
*
* In the "buf" variant, "path" is a strbuf which will also be used as a
* scratch buffer, but restored to its original contents before
* the function returns.
*/
typedef int each_loose_object_fn(const struct object_id *oid,
const char *path,
void *data);
typedef int each_loose_cruft_fn(const char *basename,
const char *path,
void *data);
typedef int each_loose_subdir_fn(unsigned int nr,
const char *path,
void *data);
int for_each_file_in_obj_subdir(unsigned int subdir_nr,
struct strbuf *path,
each_loose_object_fn obj_cb,
each_loose_cruft_fn cruft_cb,
each_loose_subdir_fn subdir_cb,
void *data);
int for_each_loose_file_in_objdir(const char *path,
each_loose_object_fn obj_cb,
each_loose_cruft_fn cruft_cb,
each_loose_subdir_fn subdir_cb,
void *data);
int for_each_loose_file_in_objdir_buf(struct strbuf *path,
each_loose_object_fn obj_cb,
each_loose_cruft_fn cruft_cb,
each_loose_subdir_fn subdir_cb,
void *data);

/* Flags for for_each_*_object() below. */
enum for_each_object_flags {
/* Iterate only over local objects, not alternates. */
FOR_EACH_OBJECT_LOCAL_ONLY = (1<<0),

/* Only iterate over packs obtained from the promisor remote. */
FOR_EACH_OBJECT_PROMISOR_ONLY = (1<<1),

/*
* Visit objects within a pack in packfile order rather than .idx order
*/
FOR_EACH_OBJECT_PACK_ORDER = (1<<2),

/* Only iterate over packs that are not marked as kept in-core. */
FOR_EACH_OBJECT_SKIP_IN_CORE_KEPT_PACKS = (1<<3),

/* Only iterate over packs that do not have .keep files. */
FOR_EACH_OBJECT_SKIP_ON_DISK_KEPT_PACKS = (1<<4),
};

/*
* Iterate over all accessible loose objects without respect to
* reachability. By default, this includes both local and alternate objects.
* The order in which objects are visited is unspecified.
*
* Any flags specific to packs are ignored.
*/
int for_each_loose_object(each_loose_object_fn, void *,
enum for_each_object_flags flags);

/*
* Iterate over all accessible packed objects without respect to reachability.
* By default, this includes both local and alternate packs.
*
* Note that some objects may appear twice if they are found in multiple packs.
* Each pack is visited in an unspecified order. By default, objects within a
* pack are visited in pack-idx order (i.e., sorted by oid).
*/
typedef int each_packed_object_fn(const struct object_id *oid,
struct packed_git *pack,
uint32_t pos,
void *data);
int for_each_object_in_pack(struct packed_git *p,
each_packed_object_fn, void *data,
enum for_each_object_flags flags);
int for_each_packed_object(struct repository *repo, each_packed_object_fn cb,
void *data, enum for_each_object_flags flags);

#endif /* OBJECT_STORE_LL_H */

Some files were not shown because too many files have changed in this diff Show More