From: Junio C Hamano Date: Sat, 18 Apr 2009 21:45:59 +0000 (-0700) Subject: Merge branch 'maint' X-Git-Tag: v1.6.3-rc1~4 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/cef5775b9f640beb51b07f8a296cfcc9b11b9744?hp=-c Merge branch 'maint' * maint: Describe fixes since 1.6.2.3 doc/git-daemon: add missing arguments to max-connections option doc/git-daemon: add missing arguments to options init: Do not segfault on big GIT_TEMPLATE_DIR environment variable imap-send: use correct configuration variable in documentation --- cef5775b9f640beb51b07f8a296cfcc9b11b9744 diff --combined Documentation/git-imap-send.txt index 024084b8b7,eed50572e0..d016dafd49 --- a/Documentation/git-imap-send.txt +++ b/Documentation/git-imap-send.txt @@@ -51,7 -51,7 +51,7 @@@ imap.host: imap.user:: The username to use when logging in to the server. - imap.password:: + imap.pass:: The password to use when logging in to the server. imap.port:: @@@ -64,13 -64,6 +64,13 @@@ imap.sslverify: used by the SSL/TLS connection. Default is `true`. Ignored when imap.tunnel is set. +imap.preformattedHTML:: + A boolean to enable/disable the use of html encoding when sending + a patch. An html encoded patch will be bracketed with
 +	and have a content type of text/html.  Ironically, enabling this
 +	option causes Thunderbird to send the patch as a plain/text,
 +	format=fixed email.  Default is `false`.
 +
  Examples
  ~~~~~~~~
  
diff --combined builtin-init-db.c
index 4e02b33bb7,bfdfc7b411..d1fa12a59e
--- a/builtin-init-db.c
+++ b/builtin-init-db.c
@@@ -122,15 -122,18 +122,17 @@@ static void copy_templates(const char *
  		template_dir = system_path(DEFAULT_GIT_TEMPLATE_DIR);
  	if (!template_dir[0])
  		return;
+ 	template_len = strlen(template_dir);
+ 	if (PATH_MAX <= (template_len+strlen("/config")))
+ 		die("insanely long template path %s", template_dir);
  	strcpy(template_path, template_dir);
- 	template_len = strlen(template_path);
  	if (template_path[template_len-1] != '/') {
  		template_path[template_len++] = '/';
  		template_path[template_len] = 0;
  	}
  	dir = opendir(template_path);
  	if (!dir) {
 -		fprintf(stderr, "warning: templates not found %s\n",
 -			template_dir);
 +		warning("templates not found %s", template_dir);
  		return;
  	}
  
@@@ -143,8 -146,8 +145,8 @@@
  
  	if (repository_format_version &&
  	    repository_format_version != GIT_REPO_VERSION) {
 -		fprintf(stderr, "warning: not copying templates of "
 -			"a wrong format version %d from '%s'\n",
 +		warning("not copying templates of "
 +			"a wrong format version %d from '%s'",
  			repository_format_version,
  			template_dir);
  		closedir(dir);