X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin.h;h=ed6ee26933430e1db4e29e62badfaf0b217935ad;hb=b5e233ecc411c8685463333d180a135c6866c50e;hp=b614d12b9f3464eff9ecfa90c2eb5ecf43a82b7e;hpb=8718e875080767f2c8d06c55c3fb5a6dddf0e5a0;p=git.git

diff --git a/builtin.h b/builtin.h
index b614d12b9..ed6ee2693 100644
--- a/builtin.h
+++ b/builtin.h
@@ -23,13 +23,13 @@ struct notes_rewrite_cfg {
 	struct notes_tree **trees;
 	const char *cmd;
 	int enabled;
-	combine_notes_fn *combine;
+	combine_notes_fn combine;
 	struct string_list *refs;
 	int refs_from_env;
 	int mode_from_env;
 };
 
-combine_notes_fn *parse_combine_notes_fn(const char *v);
+combine_notes_fn parse_combine_notes_fn(const char *v);
 struct notes_rewrite_cfg *init_copy_notes_for_rewrite(const char *cmd);
 int copy_note_for_rewrite(struct notes_rewrite_cfg *c,
 			  const unsigned char *from_obj, const unsigned char *to_obj);
@@ -37,6 +37,8 @@ void finish_copy_notes_for_rewrite(struct notes_rewrite_cfg *c);
 
 extern int check_pager_config(const char *cmd);
 
+extern int textconv_object(const char *path, const unsigned char *sha1, 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);
 extern int cmd_apply(int argc, const char **argv, const char *prefix);