summaryrefslogtreecommitdiff
path: root/commit.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-09-20 12:25:32 -0700
committerJunio C Hamano <gitster@pobox.com>2013-09-20 12:25:32 -0700
commit238504b014230d0bc244fb0de84990863fcddd59 (patch)
tree59fee63d5862631a00b91a9e7045fa5935430dd2 /commit.h
parent79e46c9fed837c565eac8d81448641d6b944a928 (diff)
parentf21d2a786b7fa6e53bb09e6466185b26f7f30d98 (diff)
downloadgit-238504b014230d0bc244fb0de84990863fcddd59.tar.gz
Merge branch 'nd/fetch-into-shallow'
When there is no sufficient overlap between old and new history during a fetch into a shallow repository, we unnecessarily sent objects the sending side knows the receiving end has. * 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.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/commit.h b/commit.h
index 90a5a3c361..bd841f4d0c 100644
--- a/commit.h
+++ b/commit.h
@@ -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 *);