From: Lars Hjemli <hjemli@gmail.com>
Date: Sat, 14 May 2011 18:00:33 +0000 (+0200)
Subject: Merge branch 'dm/disable-clone'
X-Git-Tag: v0.9.1~67
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4837fddc35bbd8d6f66a40486f75cdee3197172d;p=cgit

Merge branch 'dm/disable-clone'
---

4837fddc35bbd8d6f66a40486f75cdee3197172d
diff --cc cgit.c
index e302a7c,e0c2d9f..349d6e0
--- a/cgit.c
+++ b/cgit.c
@@@ -147,10 -139,10 +147,12 @@@ void config_cb(const char *name, const 
  		ctx.cfg.enable_filter_overrides = atoi(value);
  	else if (!strcmp(name, "enable-gitweb-owner"))
  		ctx.cfg.enable_gitweb_owner = atoi(value);
+ 	else if (!strcmp(name, "enable-http-clone"))
+ 		ctx.cfg.enable_http_clone = atoi(value);
  	else if (!strcmp(name, "enable-index-links"))
  		ctx.cfg.enable_index_links = atoi(value);
 +	else if (!strcmp(name, "enable-commit-graph"))
 +		ctx.cfg.enable_commit_graph = atoi(value);
  	else if (!strcmp(name, "enable-log-filecount"))
  		ctx.cfg.enable_log_filecount = atoi(value);
  	else if (!strcmp(name, "enable-log-linecount"))
diff --cc cgit.h
index b5f00fc,c119712..ecae453
--- a/cgit.h
+++ b/cgit.h
@@@ -191,8 -187,8 +191,9 @@@ struct cgit_config 
  	int embedded;
  	int enable_filter_overrides;
  	int enable_gitweb_owner;
+ 	int enable_http_clone;
  	int enable_index_links;
 +	int enable_commit_graph;
  	int enable_log_filecount;
  	int enable_log_linecount;
  	int enable_remote_branches;