summaryrefslogtreecommitdiff
path: root/commit.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-06-28 10:00:00 -0700
committerJunio C Hamano <gitster@pobox.com>2013-06-28 10:00:00 -0700
commit6653aa9ecd955faccb0ace6f2d8c374b8ea7daaa (patch)
tree643c1402099b6bfec3711b29280ee3cf4dc2a177 /commit.h
parente2652c0bcfdeee88f416c6e2c34163545ea30047 (diff)
parent6035d6aad8ca11954c0d7821f6f3e7c047039c8f (diff)
downloadgit-6653aa9ecd955faccb0ace6f2d8c374b8ea7daaa.tar.gz
Merge branch 'nd/clone-connectivity-shortcut' (early part) into maint
Cloning with "git clone --depth N" while fetch.fsckobjects (or transfer.fsckobjects) is set to true did not tell the cut-off points of the shallow history to the process that validates the objects and the history received, causing the validation to fail. * 'nd/clone-connectivity-shortcut' (early part): fetch-pack: prepare updated shallow file before fetching the pack clone: let the user know when check_everything_connected is run
Diffstat (limited to 'commit.h')
-rw-r--r--commit.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/commit.h b/commit.h
index 67bd5091be..6e9c7cd9d5 100644
--- a/commit.h
+++ b/commit.h
@@ -176,6 +176,8 @@ extern int for_each_commit_graft(each_commit_graft_fn, void *);
extern int is_repository_shallow(void);
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);
int is_descendant_of(struct commit *, struct commit_list *);
int in_merge_bases(struct commit *, struct commit *);