Merge branch 'maint'

diff --git a/commit.h b/commit.h
index 422f778f3f5b997ea1a3d8569cf6fa573481fff1..e5332efcfc9449e0f3af4d6c49be63adfeb138b1 100644 (file)
--- a/commit.h
+++ b/commit.h
@@ -139,7 +139,7 @@ extern struct commit_list *get_octopus_merge_bases(struct commit_list *in);
 
 extern int register_shallow(const unsigned char *sha1);
 extern int unregister_shallow(const unsigned char *sha1);
-extern int write_shallow_commits(int fd, int use_pack_protocol);
+extern int write_shallow_commits(struct strbuf *out, int use_pack_protocol);
 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);