replace-object.h: move read_replace_refs declaration from cache.h to here
Adjust several files to be more explicit about their dependency on replace-objects to accommodate this change. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
1c02840008
commit
cbeab74713
@ -18,6 +18,7 @@
|
|||||||
#include "oid-array.h"
|
#include "oid-array.h"
|
||||||
#include "packfile.h"
|
#include "packfile.h"
|
||||||
#include "object-store.h"
|
#include "object-store.h"
|
||||||
|
#include "replace-object.h"
|
||||||
#include "promisor-remote.h"
|
#include "promisor-remote.h"
|
||||||
#include "mailmap.h"
|
#include "mailmap.h"
|
||||||
|
|
||||||
|
@ -8,6 +8,7 @@
|
|||||||
#include "commit-graph.h"
|
#include "commit-graph.h"
|
||||||
#include "object-store.h"
|
#include "object-store.h"
|
||||||
#include "progress.h"
|
#include "progress.h"
|
||||||
|
#include "replace-object.h"
|
||||||
#include "tag.h"
|
#include "tag.h"
|
||||||
|
|
||||||
#define BUILTIN_COMMIT_GRAPH_VERIFY_USAGE \
|
#define BUILTIN_COMMIT_GRAPH_VERIFY_USAGE \
|
||||||
|
@ -20,6 +20,7 @@
|
|||||||
#include "decorate.h"
|
#include "decorate.h"
|
||||||
#include "packfile.h"
|
#include "packfile.h"
|
||||||
#include "object-store.h"
|
#include "object-store.h"
|
||||||
|
#include "replace-object.h"
|
||||||
#include "resolve-undo.h"
|
#include "resolve-undo.h"
|
||||||
#include "run-command.h"
|
#include "run-command.h"
|
||||||
#include "worktree.h"
|
#include "worktree.h"
|
||||||
|
@ -16,6 +16,7 @@
|
|||||||
#include "thread-utils.h"
|
#include "thread-utils.h"
|
||||||
#include "packfile.h"
|
#include "packfile.h"
|
||||||
#include "object-store.h"
|
#include "object-store.h"
|
||||||
|
#include "replace-object.h"
|
||||||
#include "promisor-remote.h"
|
#include "promisor-remote.h"
|
||||||
|
|
||||||
static const char index_pack_usage[] =
|
static const char index_pack_usage[] =
|
||||||
|
@ -32,6 +32,7 @@
|
|||||||
#include "list.h"
|
#include "list.h"
|
||||||
#include "packfile.h"
|
#include "packfile.h"
|
||||||
#include "object-store.h"
|
#include "object-store.h"
|
||||||
|
#include "replace-object.h"
|
||||||
#include "dir.h"
|
#include "dir.h"
|
||||||
#include "midx.h"
|
#include "midx.h"
|
||||||
#include "trace2.h"
|
#include "trace2.h"
|
||||||
|
@ -8,6 +8,7 @@
|
|||||||
#include "parse-options.h"
|
#include "parse-options.h"
|
||||||
#include "progress.h"
|
#include "progress.h"
|
||||||
#include "prune-packed.h"
|
#include "prune-packed.h"
|
||||||
|
#include "replace-object.h"
|
||||||
#include "object-store.h"
|
#include "object-store.h"
|
||||||
#include "shallow.h"
|
#include "shallow.h"
|
||||||
|
|
||||||
|
@ -16,6 +16,7 @@
|
|||||||
#include "parse-options.h"
|
#include "parse-options.h"
|
||||||
#include "run-command.h"
|
#include "run-command.h"
|
||||||
#include "object-store.h"
|
#include "object-store.h"
|
||||||
|
#include "replace-object.h"
|
||||||
#include "repository.h"
|
#include "repository.h"
|
||||||
#include "tag.h"
|
#include "tag.h"
|
||||||
|
|
||||||
|
@ -9,6 +9,7 @@
|
|||||||
#include "pack.h"
|
#include "pack.h"
|
||||||
#include "blob.h"
|
#include "blob.h"
|
||||||
#include "commit.h"
|
#include "commit.h"
|
||||||
|
#include "replace-object.h"
|
||||||
#include "tag.h"
|
#include "tag.h"
|
||||||
#include "tree.h"
|
#include "tree.h"
|
||||||
#include "tree-walk.h"
|
#include "tree-walk.h"
|
||||||
|
@ -4,6 +4,7 @@
|
|||||||
#include "pkt-line.h"
|
#include "pkt-line.h"
|
||||||
#include "parse-options.h"
|
#include "parse-options.h"
|
||||||
#include "protocol.h"
|
#include "protocol.h"
|
||||||
|
#include "replace-object.h"
|
||||||
#include "upload-pack.h"
|
#include "upload-pack.h"
|
||||||
#include "serve.h"
|
#include "serve.h"
|
||||||
|
|
||||||
|
8
cache.h
8
cache.h
@ -886,14 +886,6 @@ void set_shared_repository(int value);
|
|||||||
int get_shared_repository(void);
|
int get_shared_repository(void);
|
||||||
void reset_shared_repository(void);
|
void reset_shared_repository(void);
|
||||||
|
|
||||||
/*
|
|
||||||
* Do replace refs need to be checked this run? This variable is
|
|
||||||
* initialized to true unless --no-replace-object is used or
|
|
||||||
* $GIT_NO_REPLACE_OBJECTS is set, but is set to false by some
|
|
||||||
* commands that do not want replace references to be active.
|
|
||||||
*/
|
|
||||||
extern int read_replace_refs;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* These values are used to help identify parts of a repository to fsync.
|
* These values are used to help identify parts of a repository to fsync.
|
||||||
* FSYNC_COMPONENT_NONE identifies data that will not be a persistent part of the
|
* FSYNC_COMPONENT_NONE identifies data that will not be a persistent part of the
|
||||||
|
1
config.c
1
config.c
@ -23,6 +23,7 @@
|
|||||||
#include "utf8.h"
|
#include "utf8.h"
|
||||||
#include "dir.h"
|
#include "dir.h"
|
||||||
#include "color.h"
|
#include "color.h"
|
||||||
|
#include "replace-object.h"
|
||||||
#include "refs.h"
|
#include "refs.h"
|
||||||
#include "worktree.h"
|
#include "worktree.h"
|
||||||
|
|
||||||
|
@ -17,6 +17,7 @@
|
|||||||
#include "commit.h"
|
#include "commit.h"
|
||||||
#include "strvec.h"
|
#include "strvec.h"
|
||||||
#include "object-store.h"
|
#include "object-store.h"
|
||||||
|
#include "replace-object.h"
|
||||||
#include "tmp-objdir.h"
|
#include "tmp-objdir.h"
|
||||||
#include "chdir-notify.h"
|
#include "chdir-notify.h"
|
||||||
#include "shallow.h"
|
#include "shallow.h"
|
||||||
|
1
git.c
1
git.c
@ -4,6 +4,7 @@
|
|||||||
#include "help.h"
|
#include "help.h"
|
||||||
#include "run-command.h"
|
#include "run-command.h"
|
||||||
#include "alias.h"
|
#include "alias.h"
|
||||||
|
#include "replace-object.h"
|
||||||
#include "shallow.h"
|
#include "shallow.h"
|
||||||
|
|
||||||
#define RUN_SETUP (1<<0)
|
#define RUN_SETUP (1<<0)
|
||||||
|
@ -13,6 +13,7 @@
|
|||||||
#include "merge-ort.h"
|
#include "merge-ort.h"
|
||||||
#include "reflog-walk.h"
|
#include "reflog-walk.h"
|
||||||
#include "refs.h"
|
#include "refs.h"
|
||||||
|
#include "replace-object.h"
|
||||||
#include "string-list.h"
|
#include "string-list.h"
|
||||||
#include "color.h"
|
#include "color.h"
|
||||||
#include "gpg-interface.h"
|
#include "gpg-interface.h"
|
||||||
|
@ -1,11 +1,18 @@
|
|||||||
#ifndef REPLACE_OBJECT_H
|
#ifndef REPLACE_OBJECT_H
|
||||||
#define REPLACE_OBJECT_H
|
#define REPLACE_OBJECT_H
|
||||||
|
|
||||||
#include "cache.h"
|
|
||||||
#include "oidmap.h"
|
#include "oidmap.h"
|
||||||
#include "repository.h"
|
#include "repository.h"
|
||||||
#include "object-store.h"
|
#include "object-store.h"
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Do replace refs need to be checked this run? This variable is
|
||||||
|
* initialized to true unless --no-replace-object is used or
|
||||||
|
* $GIT_NO_REPLACE_OBJECTS is set, but is set to false by some
|
||||||
|
* commands that do not want replace references to be active.
|
||||||
|
*/
|
||||||
|
extern int read_replace_refs;
|
||||||
|
|
||||||
struct replace_object {
|
struct replace_object {
|
||||||
struct oidmap_entry original;
|
struct oidmap_entry original;
|
||||||
struct object_id replacement;
|
struct object_id replacement;
|
||||||
|
Loading…
Reference in New Issue
Block a user