Merge branch 'br/misc'

* br/misc:
  Use transparent background for the cgit logo
  ssdiff: anchors for ssdiff
  implement repo.logo and repo.logo-link

1 file changed, 12 insertions, 0 deletions

diff --git a/ui-diff.c b/ui-diff.cindex 7ff7e46d..a53425db 100644--- a/ui-diff.c+++ b/ui-diff.c@@ -34,6 +34,17 @@ static struct fileinfo { } *items;  static int use_ssdiff = 0;+static struct diff_filepair *current_filepair;++struct diff_filespec *cgit_get_current_old_file(void)+{+	return current_filepair->one;+}++struct diff_filespec *cgit_get_current_new_file(void)+{+	return current_filepair->two;+}  static void print_fileinfo(struct fileinfo *info) {@@ -284,6 +295,7 @@ static void filepair_cb(struct diff_filepair *pair) 	int binary = 0; 	linediff_fn print_line_fn = print_line; +	current_filepair = pair; 	if (use_ssdiff) { 		cgit_ssdiff_header_begin(); 		print_line_fn = cgit_ssdiff_line_cb;
diff --git a/ui-diff.c b/ui-diff.c
index 7ff7e46d..a53425db 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -34,6 +34,17 @@ static struct fileinfo {
 } *items;
 
 static int use_ssdiff = 0;
+static struct diff_filepair *current_filepair;
+
+struct diff_filespec *cgit_get_current_old_file(void)
+{
+	return current_filepair->one;
+}
+
+struct diff_filespec *cgit_get_current_new_file(void)
+{
+	return current_filepair->two;
+}
 
 static void print_fileinfo(struct fileinfo *info)
 {
@@ -284,6 +295,7 @@ static void filepair_cb(struct diff_filepair *pair)
 	int binary = 0;
 	linediff_fn print_line_fn = print_line;
 
+	current_filepair = pair;
 	if (use_ssdiff) {
 		cgit_ssdiff_header_begin();
 		print_line_fn = cgit_ssdiff_line_cb;