[PATCH] Always check if README exists in choose_readme()

[PATCH] Always check if README exists in choose_readme()

[cgit]

Specifying a nonexistent README file via the readme option is sometimes
useful, e.g. when using scan-path and setting a global default.
Currently, we check whether there is only one option in the readme
option and, if so, we choose that file without checking whether it
exists. As a consequence, all repositories are equipped with an about
link in the aforementioned scenario, even if there is no about file.
Remove the early check for the number of keys and always check whether
the file exists instead.

Signed-off-by: Lukas Fleischer <cgit at cryptocrack.de>
---
 cgit.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/cgit.c b/cgit.c
index 20f6e27..8c4517d 100644
--- a/cgit.c
+++ b/cgit.c
@@ -504,12 +504,6 @@ static void choose_readme(struct cgit_repo *repo)
 			free(ref);
 			continue;
 		}
-		/* If there's only one item, we skip the possibly expensive
-		 * selection process. */
-		if (repo->readme.nr == 1) {
-			found = 1;
-			break;
-		}
 		if (ref) {
 			if (cgit_ref_path_exists(filename, ref, 1)) {
 				found = 1;
-- 
2.0.3

[PATCH] Always check if README exists in choose_readme()

[Jason]

Merged. Thanks.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.zx2c4.com/pipermail/cgit/attachments/20140807/a3a81aa5/attachment.html>