summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorAxel Bonnet <axel.bonnet@ensimag.imag.fr>2010-06-07 15:23:36 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-06-11 20:17:57 (GMT)
commita788d7d58bfbd2772b7ad5d788d8f7f885a651e1 (patch)
treec03b1a4cdccec1e0654d583a13976e9ca0616116 /diff.h
parent92a75a391e66cfc278cf59741e484efd80c02176 (diff)
downloadgit-a788d7d58bfbd2772b7ad5d788d8f7f885a651e1.zip
git-a788d7d58bfbd2772b7ad5d788d8f7f885a651e1.tar.gz
git-a788d7d58bfbd2772b7ad5d788d8f7f885a651e1.tar.bz2
textconv: make the API public
The textconv functionality allows one to convert a file into text before running diff. But this functionality can be useful to other features such as blame. Signed-off-by: Axel Bonnet <axel.bonnet@ensimag.imag.fr> Signed-off-by: Clément Poulain <clement.poulain@ensimag.imag.fr> Signed-off-by: Diane Gasselin <diane.gasselin@ensimag.imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.h')
-rw-r--r--diff.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/diff.h b/diff.h
index 9ace08c..2a0e36d 100644
--- a/diff.h
+++ b/diff.h
@@ -9,6 +9,8 @@
struct rev_info;
struct diff_options;
struct diff_queue_struct;
+struct diff_filespec;
+struct userdiff_driver;
typedef void (*change_fn_t)(struct diff_options *options,
unsigned old_mode, unsigned new_mode,
@@ -287,4 +289,10 @@ extern void diff_no_index(struct rev_info *, int, const char **, int, const char
extern int index_differs_from(const char *def, int diff_flags);
+extern size_t fill_textconv(struct userdiff_driver *driver,
+ struct diff_filespec *df,
+ char **outbuf);
+
+extern struct userdiff_driver *get_textconv(struct diff_filespec *one);
+
#endif /* DIFF_H */