diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-06-27 12:07:55 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-27 12:07:55 -0700 |
| commit | cf4403a01070f03e5c5cc65b52c1351d20ff4e91 (patch) | |
| tree | f96c26b4d03521fbed7774703672ccffc4b4876d /builtin/blame.c | |
| parent | 6aa206413ad7755577cfe29b8ffd16082c211a07 (diff) | |
| parent | 9f77fe022425360dced8b1f19275852e89d2351c (diff) | |
| download | git-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/blame.c')
| -rw-r--r-- | builtin/blame.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/builtin/blame.c b/builtin/blame.c index 9b88ce925..01e62fdeb 100644 --- a/builtin/blame.c +++ b/builtin/blame.c @@ -91,10 +91,10 @@ struct origin { * if the textconv driver exists. * Return 1 if the conversion succeeds, 0 otherwise. */ -static int textconv_object(const char *path, - const unsigned char *sha1, - char **buf, - unsigned long *buf_size) +int textconv_object(const char *path, + const unsigned char *sha1, + char **buf, + unsigned long *buf_size) { struct diff_filespec *df; struct userdiff_driver *textconv; |