summaryrefslogtreecommitdiff
path: root/commit.h
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2013-12-05 20:02:34 +0700
committerJunio C Hamano <gitster@pobox.com>2013-12-10 16:14:16 -0800
commit1a30f5a2f2a3d5d9b3cf6e126ac19deb40324515 (patch)
tree048a4bc9a247a9386dcf40eb01a5de6b7b3713fb /commit.h
parentb06dcd7d6829c86afda6b311cadf009ee4b4dd59 (diff)
downloadgit-1a30f5a2f2a3d5d9b3cf6e126ac19deb40324515.tar.gz
shallow.c: extend setup_*_shallow() to accept extra shallow commits
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'commit.h')
-rw-r--r--commit.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/commit.h b/commit.h
index a8795263b6..1faf717212 100644
--- a/commit.h
+++ b/commit.h
@@ -201,10 +201,12 @@ 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 int write_shallow_commits(struct strbuf *out, int use_pack_protocol,
+ const struct sha1_array *extra);
extern void setup_alternate_shallow(struct lock_file *shallow_lock,
- const char **alternate_shallow_file);
-extern char *setup_temporary_shallow(void);
+ const char **alternate_shallow_file,
+ const struct sha1_array *extra);
+extern char *setup_temporary_shallow(const struct sha1_array *extra);
extern void advertise_shallow_grafts(int);
int is_descendant_of(struct commit *, struct commit_list *);