Merge branch 'jc/apply-binary-p0' into maint-1.7.11

diff --git a/builtin.h b/builtin.h
index cd9141932b3d77c3d5c5b04908ea3b3298c4a20d..dffb34ef4e29799bcb9a8c78bdf439547845794f 100644 (file)
--- a/builtin.h
+++ b/builtin.h
@@ -44,7 +44,7 @@ extern int check_pager_config(const char *cmd);
 struct diff_options;
 extern void setup_diff_pager(struct diff_options *);
 
-extern int textconv_object(const char *path, unsigned mode, const unsigned char *sha1, char **buf, unsigned long *buf_size);
+extern int textconv_object(const char *path, unsigned mode, const unsigned char *sha1, int sha1_valid, char **buf, unsigned long *buf_size);
 
 extern int cmd_add(int argc, const char **argv, const char *prefix);
 extern int cmd_annotate(int argc, const char **argv, const char *prefix);