4 files changed, 29 insertions, 1 deletion

diff --git a/source/cgit.c b/source/cgit.cindex d982fdb..12ed19e 100644--- a/source/cgit.c+++ b/source/cgit.c@@ -1241,6 +1241,10 @@ static int prepare_repo_cmd(int nongit, int err, int clone) 		// <link rel='vcs-git'> and those clone urls expand macros such 		// as $CGIT_REPO_URL out of this environment. 		prepare_repo_env(ctx.repo);+		// A feed reader cannot read the page below, so the feed goes+		// out with no entries.+		if (!strcmp(ctx.qry.page, "atom"))+			return 0; 		cgit_print_layout_start(); 		cgit_print_empty_repo(); 		cgit_print_layout_end();
diff --git a/source/cgit.c b/source/cgit.c
index d982fdb..12ed19e 100644
--- a/source/cgit.c
+++ b/source/cgit.c
@@ -1241,6 +1241,10 @@ static int prepare_repo_cmd(int nongit, int err, int clone)
 		// <link rel='vcs-git'> and those clone urls expand macros such
 		// as $CGIT_REPO_URL out of this environment.
 		prepare_repo_env(ctx.repo);
+		// A feed reader cannot read the page below, so the feed goes
+		// out with no entries.
+		if (!strcmp(ctx.qry.page, "atom"))
+			return 0;
 		cgit_print_layout_start();
 		cgit_print_empty_repo();
 		cgit_print_layout_end();
diff --git a/source/ui-atom.c b/source/ui-atom.cindex b9762b1..dea9360 100644--- a/source/ui-atom.c+++ b/source/ui-atom.c@@ -167,6 +167,10 @@ void cgit_print_atom(char *tip, const char *path, int max_count) 		argv[1] = "--all"; 	else if (!tip) 		argv[1] = ctx.qry.head;+	// An empty repository has no head, and a walk given nowhere to start+	// leaves the feed without entries.+	if (!argv[1])+		argc = 1;  	if (path) { 		argv[argc++] = "--";
diff --git a/source/ui-atom.c b/source/ui-atom.c
index b9762b1..dea9360 100644
--- a/source/ui-atom.c
+++ b/source/ui-atom.c
@@ -167,6 +167,10 @@ void cgit_print_atom(char *tip, const char *path, int max_count)
 		argv[1] = "--all";
 	else if (!tip)
 		argv[1] = ctx.qry.head;
+	// An empty repository has no head, and a walk given nowhere to start
+	// leaves the feed without entries.
+	if (!argv[1])
+		argc = 1;
 
 	if (path) {
 		argv[argc++] = "--";
diff --git a/source/ui-empty.c b/source/ui-empty.cindex 76b2697..0bebfec 100644--- a/source/ui-empty.c+++ b/source/ui-empty.c@@ -3,7 +3,8 @@  * the clone urls someone needs in order to push the first commit. cgit.c  * prints this in place of whatever page was asked for as soon as it finds  * there is no branch to resolve, so none of the ref driven pages ever run- * against an empty repository.+ * against an empty repository. The Atom feed is the exception, sent with no+ * entries, since a feed reader cannot read this page.  */  #include "cgit.h"
diff --git a/source/ui-empty.c b/source/ui-empty.c
index 76b2697..0bebfec 100644
--- a/source/ui-empty.c
+++ b/source/ui-empty.c
@@ -3,7 +3,8 @@
  * the clone urls someone needs in order to push the first commit. cgit.c
  * prints this in place of whatever page was asked for as soon as it finds
  * there is no branch to resolve, so none of the ref driven pages ever run
- * against an empty repository.
+ * against an empty repository. The Atom feed is the exception, sent with no
+ * entries, since a feed reader cannot read this page.
  */
 
 #include "cgit.h"
diff --git a/tests/t0111-atom.sh b/tests/t0111-atom.shindex 608ab78..3040b79 100755--- a/tests/t0111-atom.sh+++ b/tests/t0111-atom.sh@@ -63,4 +63,23 @@ test_expect_success 'the feed link encodes the repository and the branch' ' 	grep "title=.Atom feed. href=.http://example.org/foo%2Bbar/atom/?h=1%2B2." tmp ' +# A reader may subscribe before the first push, and the page every other view+# of an empty repository falls back to is no feed it can read.+test_expect_success 'an empty repository answers with a feed of no entries' '+	git init -q --bare repos/empty.git &&+	cgitrc_repo emptyrc empty "repo.path=$PWD/repos/empty.git" &&+	cgit_rc emptyrc "url=empty/atom" >tmp &&+	head -n 1 tmp | grep "Status: 200 OK" &&+	sed "/^$/q" tmp | grep "Content-Type: application/atom+xml" &&+	strip_headers <tmp >feed &&+	grep "<title>empty</title>" feed &&+	grep "<updated>" feed &&+	! grep "<entry>" feed &&+	grep "</feed>" feed+'++test_expect_success XMLLINT 'the empty feed is well-formed xml' '+	xmllint --noout feed+'+ test_done
diff --git a/tests/t0111-atom.sh b/tests/t0111-atom.sh
index 608ab78..3040b79 100755
--- a/tests/t0111-atom.sh
+++ b/tests/t0111-atom.sh
@@ -63,4 +63,23 @@ test_expect_success 'the feed link encodes the repository and the branch' '
 	grep "title=.Atom feed. href=.http://example.org/foo%2Bbar/atom/?h=1%2B2." tmp
 '
 
+# A reader may subscribe before the first push, and the page every other view
+# of an empty repository falls back to is no feed it can read.
+test_expect_success 'an empty repository answers with a feed of no entries' '
+	git init -q --bare repos/empty.git &&
+	cgitrc_repo emptyrc empty "repo.path=$PWD/repos/empty.git" &&
+	cgit_rc emptyrc "url=empty/atom" >tmp &&
+	head -n 1 tmp | grep "Status: 200 OK" &&
+	sed "/^$/q" tmp | grep "Content-Type: application/atom+xml" &&
+	strip_headers <tmp >feed &&
+	grep "<title>empty</title>" feed &&
+	grep "<updated>" feed &&
+	! grep "<entry>" feed &&
+	grep "</feed>" feed
+'
+
+test_expect_success XMLLINT 'the empty feed is well-formed xml' '
+	xmllint --noout feed
+'
+
 test_done