diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-10-24 00:32:17 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-10-24 00:32:17 +0400 |
commit | 6ba0d9551a2963a6fed83b90b55a373d79ef46d0 (patch) | |
tree | 528a196ba43fa7a9d519e2a2a2864a64ebd25091 /commit.h | |
parent | 5f737ac91bd869e65bff401ad1108581ac504e22 (diff) | |
parent | f21d2a786b7fa6e53bb09e6466185b26f7f30d98 (diff) |
Merge branch 'nd/fetch-into-shallow' into maint
When there is no sufficient overlap between old and new history
during a "git fetch" into a shallow repository, objects that the
sending side knows the receiving end has were unnecessarily sent.
* nd/fetch-into-shallow:
Add testcase for needless objects during a shallow fetch
list-objects: mark more commits as edges in mark_edges_uninteresting
list-objects: reduce one argument in mark_edges_uninteresting
upload-pack: delegate rev walking in shallow fetch to pack-objects
shallow: add setup_temporary_shallow()
shallow: only add shallow graft points to new shallow file
move setup_alternate_shallow and write_shallow_commits to shallow.c
Diffstat (limited to 'commit.h')
-rw-r--r-- | commit.h | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -201,6 +201,10 @@ extern struct commit_list *get_shallow_commits(struct object_array *heads, int depth, int shallow_flag, int not_shallow_flag); extern void check_shallow_file_for_update(void); extern void set_alternate_shallow_file(const char *path); +extern int write_shallow_commits(struct strbuf *out, int use_pack_protocol); +extern void setup_alternate_shallow(struct lock_file *shallow_lock, + const char **alternate_shallow_file); +extern char *setup_temporary_shallow(void); int is_descendant_of(struct commit *, struct commit_list *); int in_merge_bases(struct commit *, struct commit *); |