ui-commit: Display git notes when present

[cgit.git] / cgit.h

diff --git a/cgit.h b/cgit.h
index 8884f9e500dddb7d403ed1877217d8f3600bb041..32d9d2b026550046b8b0dd8dea60cf45d38fb267 100644 (file)
--- a/cgit.h
+++ b/cgit.h
@@ -19,6 +19,7 @@
 #include <xdiff-interface.h>
 #include <xdiff/xdiff.h>
 #include <utf8.h>
+#include <notes.h>
 
 
 /*
@@ -147,6 +148,9 @@ struct cgit_query {
        int showmsg;
        int ssdiff;
        int show_all;
+       int context;
+       int ignorews;
+       char *vpath;
 };
 
 struct cgit_config {
@@ -277,11 +281,12 @@ extern void *cgit_free_commitinfo(struct commitinfo *info);
 extern int cgit_diff_files(const unsigned char *old_sha1,
                           const unsigned char *new_sha1,
                           unsigned long *old_size, unsigned long *new_size,
-                          int *binary, linediff_fn fn);
+                          int *binary, int context, int ignorews,
+                          linediff_fn fn);
 
 extern void cgit_diff_tree(const unsigned char *old_sha1,
                           const unsigned char *new_sha1,
-                          filepair_fn fn, const char *prefix);
+                          filepair_fn fn, const char *prefix, int ignorews);
 
 extern void cgit_diff_commit(struct commit *commit, filepair_fn fn);
 
@@ -300,4 +305,6 @@ extern int cgit_close_filter(struct cgit_filter *filter);
 
 extern int readfile(const char *path, char **buf, size_t *size);
 
+extern char *expand_macros(const char *txt);
+
 #endif /* CGIT_H */