From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 24 Apr 2025 18:37:21 +0000 (-0700)
Subject: Merge branch 'ps/object-file-cleanup' into ps/object-store-cleanup
X-Git-Tag: v2.50.0-rc0~53^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d61ff9c237b05f9cff0831d4bde546ed4a9c3c42;p=thirdparty%2Fgit.git

Merge branch 'ps/object-file-cleanup' into ps/object-store-cleanup

* 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"
---

d61ff9c237b05f9cff0831d4bde546ed4a9c3c42
diff --cc builtin/cat-file.c
index ead7554a57,c870fde260..0e3f10a946
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@@ -21,10 -20,9 +21,10 @@@
  #include "streaming.h"
  #include "oid-array.h"
  #include "packfile.h"
 +#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"
diff --cc builtin/checkout.c
index e69ea06713,8136962e2b..d185982f3a
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@@ -17,9 -17,10 +17,10 @@@
  #include "merge-ll.h"
  #include "lockfile.h"
  #include "mem-pool.h"
 -#include "merge-recursive.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"
diff --cc builtin/rev-list.c
index 4a84f18f9e,0170d79b62..c4cd4ed5c8
--- a/builtin/rev-list.c
+++ b/builtin/rev-list.c
@@@ -14,9 -14,8 +14,9 @@@
  #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"
  #include "graph.h"
  #include "bisect.h"
diff --cc git-compat-util.h
index afa040086f,9273a8ee08..591bb78ad9
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@@ -598,6 -871,167 +598,9 @@@ static inline bool strip_suffix(const c
  #define DEFAULT_PACKED_GIT_LIMIT \
  	((1024L * 1024L) * (size_t)(sizeof(void*) >= 8 ? (32 * 1024L * 1024L) : 256))
  
 -#ifdef NO_PREAD
 -#define pread git_pread
 -ssize_t git_pread(int fd, void *buf, size_t count, off_t offset);
 -#endif
 -
 -#ifdef NO_SETENV
 -#define setenv gitsetenv
 -int gitsetenv(const char *, const char *, int);
 -#endif
 -
 -#ifdef NO_MKDTEMP
 -#define mkdtemp gitmkdtemp
 -char *gitmkdtemp(char *);
 -#endif
 -
 -#ifdef NO_UNSETENV
 -#define unsetenv gitunsetenv
 -int gitunsetenv(const char *);
 -#endif
 -
 -#ifdef NO_STRCASESTR
 -#define strcasestr gitstrcasestr
 -char *gitstrcasestr(const char *haystack, const char *needle);
 -#endif
 -
 -#ifdef NO_STRLCPY
 -#define strlcpy gitstrlcpy
 -size_t gitstrlcpy(char *, const char *, size_t);
 -#endif
 -
 -#ifdef NO_STRTOUMAX
 -#define strtoumax gitstrtoumax
 -uintmax_t gitstrtoumax(const char *, char **, int);
 -#define strtoimax gitstrtoimax
 -intmax_t gitstrtoimax(const char *, char **, int);
 -#endif
 -
 -#ifdef NO_HSTRERROR
 -#define hstrerror githstrerror
 -const char *githstrerror(int herror);
 -#endif
 -
 -#ifdef NO_MEMMEM
 -#define memmem gitmemmem
 -void *gitmemmem(const void *haystack, size_t haystacklen,
 -		const void *needle, size_t needlelen);
 -#endif
 -
 -#ifdef OVERRIDE_STRDUP
 -#ifdef strdup
 -#undef strdup
 -#endif
 -#define strdup gitstrdup
 -char *gitstrdup(const char *s);
 -#endif
 -
 -#ifdef NO_GETPAGESIZE
 -#define getpagesize() sysconf(_SC_PAGESIZE)
 -#endif
 -
 -#ifndef O_CLOEXEC
 -#define O_CLOEXEC 0
 -#endif
 -
 -#ifdef FREAD_READS_DIRECTORIES
 -# if !defined(SUPPRESS_FOPEN_REDEFINITION)
 -#  ifdef fopen
 -#   undef fopen
 -#  endif
 -#  define fopen(a,b) git_fopen(a,b)
 -# endif
 -FILE *git_fopen(const char*, const char*);
 -#endif
 -
 -#ifdef SNPRINTF_RETURNS_BOGUS
 -#ifdef snprintf
 -#undef snprintf
 -#endif
 -#define snprintf git_snprintf
 -int git_snprintf(char *str, size_t maxsize,
 -		 const char *format, ...);
 -#ifdef vsnprintf
 -#undef vsnprintf
 -#endif
 -#define vsnprintf git_vsnprintf
 -int git_vsnprintf(char *str, size_t maxsize,
 -		  const char *format, va_list ap);
 -#endif
 -
 -#ifdef OPEN_RETURNS_EINTR
 -#undef open
 -#define open git_open_with_retry
 -int git_open_with_retry(const char *path, int flag, ...);
 -#endif
 -
+ int git_open_cloexec(const char *name, int flags);
+ #define git_open(name) git_open_cloexec(name, O_RDONLY)
+ 
 -#ifdef __GLIBC_PREREQ
 -#if __GLIBC_PREREQ(2, 1)
 -#define HAVE_STRCHRNUL
 -#endif
 -#endif
 -
 -#ifndef HAVE_STRCHRNUL
 -#define strchrnul gitstrchrnul
 -static inline char *gitstrchrnul(const char *s, int c)
 -{
 -	while (*s && *s != c)
 -		s++;
 -	return (char *)s;
 -}
 -#endif
 -
 -#ifdef NO_INET_PTON
 -int inet_pton(int af, const char *src, void *dst);
 -#endif
 -
 -#ifdef NO_INET_NTOP
 -const char *inet_ntop(int af, const void *src, char *dst, size_t size);
 -#endif
 -
 -#ifdef NO_PTHREADS
 -#define atexit git_atexit
 -int git_atexit(void (*handler)(void));
 -#endif
 -
  static inline size_t st_add(size_t a, size_t b)
  {
  	if (unsigned_add_overflows(a, b))
diff --cc reflog.c
index 642b162ef7,60834a124d..12f7a02e34
--- a/reflog.c
+++ b/reflog.c
@@@ -2,10 -2,8 +2,10 @@@
  #define DISABLE_SIGN_COMPARE_WARNINGS
  
  #include "git-compat-util.h"
 +#include "config.h"
  #include "gettext.h"
- #include "object-store-ll.h"
 +#include "parse-options.h"
+ #include "object-store.h"
  #include "reflog.h"
  #include "refs.h"
  #include "revision.h"