X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/57f6a8bf0de6c112cabc1d8e20ade2698bd886b7..b8be028a309381b83abe924f5e8e01cf02b121a2:/shared.c?ds=inline

diff --git a/shared.c b/shared.c
index ce3ca4f..f20fb5c 100644
--- a/shared.c
+++ b/shared.c
@@ -34,6 +34,7 @@ int cgit_cache_repo_ttl        =  5;
 int cgit_cache_dynamic_ttl     =  5;
 int cgit_cache_static_ttl      = -1;
 int cgit_cache_max_create_time =  5;
+int cgit_summary_log           =  0;
 
 int cgit_max_msg_len = 60;
 int cgit_max_repodesc_len = 60;
@@ -58,7 +59,8 @@ int htmlfd = 0;
 
 int cgit_get_cmd_index(const char *cmd)
 {
-	static char *cmds[] = {"log", "commit", "diff", "tree", "view", "blob", "snapshot", NULL};
+	static char *cmds[] = {"log", "commit", "diff", "tree", "blob",
+			       "snapshot", NULL};
 	int i;
 
 	for(i = 0; cmds[i]; i++)
@@ -107,6 +109,7 @@ struct repoinfo *add_repo(const char *url)
 	ret->enable_log_filecount = cgit_enable_log_filecount;
 	ret->enable_log_linecount = cgit_enable_log_linecount;
 	ret->module_link = cgit_module_link;
+	ret->readme = NULL;
 	return ret;
 }
 
@@ -163,6 +166,8 @@ void cgit_global_config_cb(const char *name, const char *value)
 		cgit_max_repodesc_len = atoi(value);
 	else if (!strcmp(name, "max-commit-count"))
 		cgit_max_commit_count = atoi(value);
+	else if (!strcmp(name, "summary-log"))
+		cgit_summary_log = atoi(value);
 	else if (!strcmp(name, "agefile"))
 		cgit_agefile = xstrdup(value);
 	else if (!strcmp(name, "repo.group"))
@@ -187,7 +192,12 @@ void cgit_global_config_cb(const char *name, const char *value)
 		cgit_repo->enable_log_linecount = cgit_enable_log_linecount * atoi(value);
 	else if (cgit_repo && !strcmp(name, "repo.module-link"))
 		cgit_repo->module_link= xstrdup(value);
-	else if (!strcmp(name, "include"))
+	else if (cgit_repo && !strcmp(name, "repo.readme") && value != NULL) {
+		if (*value == '/')
+			cgit_repo->readme = xstrdup(value);
+		else
+			cgit_repo->readme = xstrdup(fmt("%s/%s", cgit_repo->path, value));
+	} else if (!strcmp(name, "include"))
 		cgit_read_config(value, cgit_global_config_cb);
 }
 
@@ -350,7 +360,7 @@ void cgit_diff_tree(const unsigned char *old_sha1,
 	opt.format_callback_data = fn;
 	diff_setup_done(&opt);
 
-	if (old_sha1)
+	if (old_sha1 && !is_null_sha1(old_sha1))
 		ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt);
 	else
 		ret = diff_root_tree_sha1(new_sha1, "", &opt);