summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-06-27 19:07:44 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-06-27 19:07:44 (GMT)
commit4af574dbdc543b43e16838ed69890470b763136d (patch)
tree47cc6f4185420bf3ac405a4018cc25d7047af21d /diff.c
parenta81f1a825bebe1b4d202832b804957d1547d7f60 (diff)
parent37d29e1051ef8406d21f8b284a659080fcfe3f72 (diff)
downloadgit-4af574dbdc543b43e16838ed69890470b763136d.zip
git-4af574dbdc543b43e16838ed69890470b763136d.tar.gz
git-4af574dbdc543b43e16838ed69890470b763136d.tar.bz2
Merge branch 'ab/blame-textconv'
* ab/blame-textconv: t/t8006: test textconv support for blame textconv: support for blame textconv: make the API public Conflicts: diff.h
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/diff.c b/diff.c
index c692526..2332fa6 100644
--- a/diff.c
+++ b/diff.c
@@ -44,10 +44,6 @@ static char diff_colors[][COLOR_MAXLEN] = {
GIT_COLOR_NORMAL, /* FUNCINFO */
};
-static void diff_filespec_load_driver(struct diff_filespec *one);
-static size_t fill_textconv(struct userdiff_driver *driver,
- struct diff_filespec *df, char **outbuf);
-
static int parse_diff_color_slot(const char *var, int ofs)
{
if (!strcasecmp(var+ofs, "plain"))
@@ -1810,7 +1806,7 @@ void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const
options->b_prefix = b;
}
-static struct userdiff_driver *get_textconv(struct diff_filespec *one)
+struct userdiff_driver *get_textconv(struct diff_filespec *one)
{
if (!DIFF_FILE_VALID(one))
return NULL;
@@ -4243,9 +4239,9 @@ static char *run_textconv(const char *pgm, struct diff_filespec *spec,
return strbuf_detach(&buf, outsize);
}
-static size_t fill_textconv(struct userdiff_driver *driver,
- struct diff_filespec *df,
- char **outbuf)
+size_t fill_textconv(struct userdiff_driver *driver,
+ struct diff_filespec *df,
+ char **outbuf)
{
size_t size;