aboutsummaryrefslogtreecommitdiff
path: root/builtin.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-06-27 12:07:55 -0700
committerJunio C Hamano <gitster@pobox.com>2010-06-27 12:07:55 -0700
commitcf4403a01070f03e5c5cc65b52c1351d20ff4e91 (patch)
treef96c26b4d03521fbed7774703672ccffc4b4876d /builtin.h
parent6aa206413ad7755577cfe29b8ffd16082c211a07 (diff)
parent9f77fe022425360dced8b1f19275852e89d2351c (diff)
downloadgit-cf4403a01070f03e5c5cc65b52c1351d20ff4e91.tar.gz
git-cf4403a01070f03e5c5cc65b52c1351d20ff4e91.tar.xz
Merge branch 'cp/textconv-cat-file'
* cp/textconv-cat-file: git-cat-file.txt: Document --textconv t/t8007: test textconv support for cat-file textconv: support for cat_file sha1_name: add get_sha1_with_context()
Diffstat (limited to 'builtin.h')
-rw-r--r--builtin.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin.h b/builtin.h
index 1054c6e29..ed6ee2693 100644
--- a/builtin.h
+++ b/builtin.h
@@ -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);