GopherProxy

	tMerge remote-tracking branch 'upstream/master' - stagit - [fork] customized bu…
	git clone git://src.adamsgaard.dk/stagit
	Log
	Files
	Refs
	README
	LICENSE
	---
	commit c413dc3336479c76292bf3225d58bb55c43da056
	parent 266351f14f1f75459a6d2e81d27513da080ad065
	Author: Anders Damsgaard <[email protected]>
	Date: Sat, 23 May 2020 20:59:27 +0200

	Merge remote-tracking branch 'upstream/master'

	Diffstat:
	M Makefile \| 2 +-
	M stagit-index.c \| 7 +------
	M stagit.c \| 7 ++++---

	3 files changed, 6 insertions(+), 10 deletions(-)
	---
	diff --git a/Makefile b/Makefile
	t@@ -1,7 +1,7 @@
	.POSIX:

	NAME = stagit
	-VERSION = 0.9.2
	+VERSION = 0.9.3

	# paths
	PREFIX = /usr/local
	diff --git a/stagit-index.c b/stagit-index.c
	t@@ -1,18 +1,13 @@
	-#include <sys/stat.h>
	-
	#include <err.h>
	-#include <errno.h>
	-#include <inttypes.h>
	#include <limits.h>
	#include <stdio.h>
	#include <stdlib.h>
	#include <string.h>
	+#include <time.h>
	#include <unistd.h>

	#include <git2.h>

	-#include "compat.h"
	-
	static git_repository *repo;

	static const char *relpath = "";
	diff --git a/stagit.c b/stagit.c
	t@@ -3,12 +3,13 @@

	#include <err.h>
	#include <errno.h>
	-#include <inttypes.h>
	#include <libgen.h>
	#include <limits.h>
	+#include <stdint.h>
	#include <stdio.h>
	#include <stdlib.h>
	#include <string.h>
	+#include <time.h>
	#include <unistd.h>

	#include <git2.h>
	t@@ -696,11 +697,11 @@ printcommitatom(FILE fp, struct commitinfo ci)
	xmlencode(fp, ci->summary, strlen(ci->summary));
	fputs("</title>\n", fp);
	}
	- fprintf(fp, "<link rel=\"alternate\" type=\"text/html\" href=\"commit/…
	+ fprintf(fp, "<link rel=\"alternate\" type=\"text/html\" href=\"commit/…
	ci->oid);

	if (ci->author) {
	- fputs("<author><name>", fp);
	+ fputs("<author>\n<name>", fp);
	xmlencode(fp, ci->author->name, strlen(ci->author->name));
	fputs("</name>\n<email>", fp);
	xmlencode(fp, ci->author->email, strlen(ci->author->email));