object-file.h: move declarations for object-file.c functions from cache.h
Signed-off-by: Elijah Newren <newren@gmail.com> Acked-by: Calvin Wan <calvinwan@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Elijah Newren
committed by
Junio C Hamano
Junio C Hamano
parent
d530c04e2c
commit
87bed17907
123
cache.h
123
cache.h
@ -3,7 +3,6 @@
|
||||
|
||||
#include "git-compat-util.h"
|
||||
#include "strbuf.h"
|
||||
#include "git-zlib.h"
|
||||
#include "hashmap.h"
|
||||
#include "list.h"
|
||||
#include "gettext.h"
|
||||
@ -596,13 +595,6 @@ int has_racy_timestamp(struct index_state *istate);
|
||||
int ie_match_stat(struct index_state *, const struct cache_entry *, struct stat *, unsigned int);
|
||||
int ie_modified(struct index_state *, const struct cache_entry *, struct stat *, unsigned int);
|
||||
|
||||
#define HASH_WRITE_OBJECT 1
|
||||
#define HASH_FORMAT_CHECK 2
|
||||
#define HASH_RENORMALIZE 4
|
||||
#define HASH_SILENT 8
|
||||
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);
|
||||
|
||||
/*
|
||||
* Record to sd the data from st that we use to check whether a file
|
||||
* might have changed.
|
||||
@ -664,107 +656,6 @@ extern int quote_path_fully;
|
||||
#define DATA_CHANGED 0x0020
|
||||
#define TYPE_CHANGED 0x0040
|
||||
|
||||
/*
|
||||
* 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.
|
||||
*/
|
||||
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 mkdir_in_gitdir(const char *path);
|
||||
|
||||
int git_open_cloexec(const char *name, int flags);
|
||||
#define git_open(name) git_open_cloexec(name, O_RDONLY)
|
||||
|
||||
/**
|
||||
* unpack_loose_header() initializes the data stream needed to unpack
|
||||
* a loose object header.
|
||||
*
|
||||
* Returns:
|
||||
*
|
||||
* - ULHR_OK on success
|
||||
* - ULHR_BAD on error
|
||||
* - ULHR_TOO_LONG if the header was too long
|
||||
*
|
||||
* It will only parse up to MAX_HEADER_LEN bytes unless an optional
|
||||
* "hdrbuf" argument is non-NULL. This is intended for use with
|
||||
* OBJECT_INFO_ALLOW_UNKNOWN_TYPE to extract the bad type for (error)
|
||||
* reporting. The full header will be extracted to "hdrbuf" for use
|
||||
* with parse_loose_header(), ULHR_TOO_LONG will still be returned
|
||||
* from this function to indicate that the header was too long.
|
||||
*/
|
||||
enum unpack_loose_header_result {
|
||||
ULHR_OK,
|
||||
ULHR_BAD,
|
||||
ULHR_TOO_LONG,
|
||||
};
|
||||
enum unpack_loose_header_result unpack_loose_header(git_zstream *stream,
|
||||
unsigned char *map,
|
||||
unsigned long mapsize,
|
||||
void *buffer,
|
||||
unsigned long bufsiz,
|
||||
struct strbuf *hdrbuf);
|
||||
|
||||
/**
|
||||
* parse_loose_header() parses the starting "<type> <len>\0" of an
|
||||
* object. If it doesn't follow that format -1 is returned. To check
|
||||
* the validity of the <type> populate the "typep" in the "struct
|
||||
* object_info". It will be OBJ_BAD if the object type is unknown. The
|
||||
* parsed <len> can be retrieved via "oi->sizep", and from there
|
||||
* passed to unpack_loose_rest().
|
||||
*/
|
||||
struct object_info;
|
||||
int parse_loose_header(const char *hdr, struct object_info *oi);
|
||||
|
||||
/**
|
||||
* With in-core object data in "buf", rehash it to make sure the
|
||||
* object name actually matches "oid" to detect object corruption.
|
||||
*
|
||||
* A negative value indicates an error, usually that the OID is not
|
||||
* what we expected, but it might also indicate another error.
|
||||
*/
|
||||
int check_object_signature(struct repository *r, const struct object_id *oid,
|
||||
void *map, unsigned long size,
|
||||
enum object_type type);
|
||||
|
||||
/**
|
||||
* A streaming version of check_object_signature().
|
||||
* Try reading the object named with "oid" using
|
||||
* the streaming interface and rehash it to do the same.
|
||||
*/
|
||||
int stream_object_signature(struct repository *r, const struct object_id *oid);
|
||||
|
||||
int finalize_object_file(const char *tmpfile, const char *filename);
|
||||
|
||||
/* Helper to check and "touch" a file */
|
||||
int check_and_freshen_file(const char *fn, int freshen);
|
||||
|
||||
int base_name_compare(const char *name1, size_t len1, int mode1,
|
||||
const char *name2, size_t len2, int mode2);
|
||||
int df_name_compare(const char *name1, size_t len1, int mode1,
|
||||
@ -772,12 +663,6 @@ int df_name_compare(const char *name1, size_t len1, int mode1,
|
||||
int name_compare(const char *name1, size_t len1, const char *name2, size_t len2);
|
||||
int cache_name_stage_compare(const char *name1, int len1, int stage1, const char *name2, int len2, int stage2);
|
||||
|
||||
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);
|
||||
|
||||
const char *git_editor(void);
|
||||
const char *git_sequence_editor(void);
|
||||
const char *git_pager(int stdout_is_tty);
|
||||
@ -819,14 +704,6 @@ struct pack_entry {
|
||||
struct packed_git *p;
|
||||
};
|
||||
|
||||
/*
|
||||
* Set this to 0 to prevent oid_object_info_extended() from fetching missing
|
||||
* blobs. This has a difference only if extensions.partialClone is set.
|
||||
*
|
||||
* Its default value is 1.
|
||||
*/
|
||||
extern int fetch_if_missing;
|
||||
|
||||
/* Dumb servers support */
|
||||
int update_server_info(int);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user