summaryrefslogtreecommitdiff
path: root/diff.h
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.h
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.h')
-rw-r--r--diff.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/diff.h b/diff.h
index 48abe7a..063d10a 100644
--- a/diff.h
+++ b/diff.h
@@ -10,6 +10,8 @@ struct rev_info;
struct diff_options;
struct diff_queue_struct;
struct strbuf;
+struct diff_filespec;
+struct userdiff_driver;
typedef void (*change_fn_t)(struct diff_options *options,
unsigned old_mode, unsigned new_mode,
@@ -74,6 +76,7 @@ typedef struct strbuf *(*diff_prefix_fn_t)(struct diff_options *opt, void *data)
#define DIFF_OPT_SUBMODULE_LOG (1 << 23)
#define DIFF_OPT_DIRTY_SUBMODULES (1 << 24)
#define DIFF_OPT_IGNORE_UNTRACKED_IN_SUBMODULES (1 << 25)
+#define DIFF_OPT_IGNORE_DIRTY_SUBMODULES (1 << 26)
#define DIFF_OPT_TST(opts, flag) ((opts)->flags & DIFF_OPT_##flag)
#define DIFF_OPT_SET(opts, flag) ((opts)->flags |= DIFF_OPT_##flag)
@@ -292,4 +295,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 */