X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/8a92df033e974af6338b530a0d78d1bdb0b0f918..3cb5d86dc68bab4883bf5a7cbc90f3e266237355:/cgit.c

diff --git a/cgit.c b/cgit.c
index 0bf8972..29e075d 100644
--- a/cgit.c
+++ b/cgit.c
@@ -84,7 +84,12 @@ static void repo_config(struct cgit_repo *repo, const char *name, const char *va
 		repo->enable_remote_branches = atoi(value);
 	else if (!strcmp(name, "enable-subject-links"))
 		repo->enable_subject_links = atoi(value);
-	else if (!strcmp(name, "commit-sort")) {
+	else if (!strcmp(name, "branch-sort")) {
+		if (!strcmp(value, "age"))
+			repo->branch_sort = 1;
+		if (!strcmp(value, "name"))
+			repo->branch_sort = 0;
+	} else if (!strcmp(name, "commit-sort")) {
 		if (!strcmp(value, "date"))
 			repo->commit_sort = 1;
 		if (!strcmp(value, "topo"))
@@ -271,6 +276,11 @@ static void config_cb(const char *name, const char *value)
 			ctx.cfg.commit_sort = 1;
 		if (!strcmp(value, "topo"))
 			ctx.cfg.commit_sort = 2;
+	} else if (!strcmp(name, "branch-sort")) {
+		if (!strcmp(value, "age"))
+			ctx.cfg.branch_sort = 1;
+		if (!strcmp(value, "name"))
+			ctx.cfg.branch_sort = 0;
 	} else if (!prefixcmp(name, "mimetype."))
 		add_mimetype(name + 9, value);
 	else if (!strcmp(name, "include"))
@@ -345,6 +355,8 @@ static void prepare_context(struct cgit_context *ctx)
 	ctx->cfg.cache_scanrc_ttl = 15;
 	ctx->cfg.cache_static_ttl = -1;
 	ctx->cfg.case_sensitive_sort = 1;
+	ctx->cfg.branch_sort = 0;
+	ctx->cfg.commit_sort = 0;
 	ctx->cfg.css = "/cgit.css";
 	ctx->cfg.logo = "/cgit.png";
 	ctx->cfg.local_time = 0;
@@ -459,8 +471,6 @@ static char *guess_defbranch(void)
 
 static int prepare_repo_cmd(struct cgit_context *ctx)
 {
-	char *user_home;
-	char *xdg_home;
 	unsigned char sha1[20];
 	int nongit = 0;
 	int rc;
@@ -471,11 +481,6 @@ static int prepare_repo_cmd(struct cgit_context *ctx)
 	/* Do not look in /etc/ for gitconfig and gitattributes. */
 	setenv("GIT_CONFIG_NOSYSTEM", "1", 1);
 	setenv("GIT_ATTR_NOSYSTEM", "1", 1);
-
-	/* We unset HOME and XDG_CONFIG_HOME before calling the git setup function
-	 * so that we don't make unneccessary filesystem accesses. */
-	user_home = getenv("HOME");
-	xdg_home = getenv("XDG_CONFIG_HOME");
 	unsetenv("HOME");
 	unsetenv("XDG_CONFIG_HOME");
 
@@ -485,10 +490,6 @@ static int prepare_repo_cmd(struct cgit_context *ctx)
 	setup_git_directory_gently(&nongit);
 	init_display_notes(NULL);
 
-	/* We restore the unset variables afterward. */
-	setenv("HOME", user_home, 1);
-	setenv("XDG_CONFIG_HOME", xdg_home, 1);
-
 	if (nongit) {
 		const char *name = ctx->repo->name;
 		rc = errno;
@@ -664,6 +665,20 @@ static void print_repo(FILE *f, struct cgit_repo *repo)
 	if (repo->max_stats != ctx.cfg.max_stats)
 		fprintf(f, "repo.max-stats=%s\n",
 		        cgit_find_stats_periodname(repo->max_stats));
+	if (repo->logo)
+		fprintf(f, "repo.logo=%s\n", repo->logo);
+	if (repo->logo_link)
+		fprintf(f, "repo.logo-link=%s\n", repo->logo_link);
+	fprintf(f, "repo.enable-remote-branches=%d\n", repo->enable_remote_branches);
+	fprintf(f, "repo.enable-subject-links=%d\n", repo->enable_subject_links);
+	if (repo->branch_sort == 1)
+		fprintf(f, "repo.branch-sort=age\n");
+	if (repo->commit_sort) {
+		if (repo->commit_sort == 1)
+			fprintf(f, "repo.commit-sort=date\n");
+		else if (repo->commit_sort == 2)
+			fprintf(f, "repo.commit-sort=topo\n");
+	}
 	fprintf(f, "\n");
 }