diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-05-13 12:19:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-05-13 12:19:18 -0700 |
| commit | 896833b2687ce09a4965e5b4f3992daad096a65b (patch) | |
| tree | 5edc5ea6874a06b4f78856339b3fab204dcaaa96 /fetch-pack.c | |
| parent | b994622632154fc3b17fb40a38819ad954a5fb88 (diff) | |
| parent | cac4b8e22ee39e52341d718450f8e4055c4dc16f (diff) | |
| download | git-896833b2687ce09a4965e5b4f3992daad096a65b.tar.gz | |
Merge branch 'tb/shallow-cleanup'
Code cleanup.
* tb/shallow-cleanup:
shallow: use struct 'shallow_lock' for additional safety
shallow.h: document '{commit,rollback}_shallow_file'
shallow: extract a header file for shallow-related functions
commit: make 'commit_graft_pos' non-static
Diffstat (limited to 'fetch-pack.c')
| -rw-r--r-- | fetch-pack.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fetch-pack.c b/fetch-pack.c index f73a2ce6cb..7eaa19d7c1 100644 --- a/fetch-pack.c +++ b/fetch-pack.c @@ -22,6 +22,7 @@ #include "connected.h" #include "fetch-negotiator.h" #include "fsck.h" +#include "shallow.h" static int transfer_unpack_limit = -1; static int fetch_unpack_limit = -1; @@ -34,7 +35,7 @@ static int fetch_fsck_objects = -1; static int transfer_fsck_objects = -1; static int agent_supported; static int server_supports_filtering; -static struct lock_file shallow_lock; +static struct shallow_lock shallow_lock; static const char *alternate_shallow_file; static struct strbuf fsck_msg_types = STRBUF_INIT; |