all repos — cgit @ 6e54bd009c24ba353314a09257eb1e1a52fb139d

a hyperfast web frontend for git written in c 

Merge branch 'stable'

* stable:
  Support "/" as virtual-root
Lars Hjemli hjemli@gmail.com
Thu, 08 Nov 2007 12:22:39 +0100
commit

6e54bd009c24ba353314a09257eb1e1a52fb139d

parent

1ae41a0d1ebf14f03dcf009aff1a79f0d26ad591

1 files changed, 4 insertions(+), 2 deletions(-)

jump to
M shared.c → shared.c 
@@ -157,9 +157,11 @@ else if (!strcmp(name, "logo-link"))
 		cgit_logo_link = xstrdup(value);
 	else if (!strcmp(name, "module-link"))
 		cgit_module_link = xstrdup(value);
-	else if (!strcmp(name, "virtual-root"))
+	else if (!strcmp(name, "virtual-root")) {
 		cgit_virtual_root = trim_end(value, '/');
-	else if (!strcmp(name, "nocache"))
+		if (!cgit_virtual_root && (!strcmp(value, "/")))
+			cgit_virtual_root = "";
+	} else if (!strcmp(name, "nocache"))
 		cgit_nocache = atoi(value);
 	else if (!strcmp(name, "snapshots"))
 		cgit_snapshots = cgit_parse_snapshots_mask(value);