From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 1 Jun 2018 06:06:40 +0000 (+0900)
Subject: Merge branch 'rd/init-typo'
X-Git-Tag: v2.18.0-rc1~10
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ba928e974021570f96309a655981a7d10d82c430?ds=inline;hp=-c

Merge branch 'rd/init-typo'

Message fix.

* rd/init-typo:
init: fix grammar in "templates not found" msg
---

ba928e974021570f96309a655981a7d10d82c430
diff --combined builtin/init-db.c
index 5a5844c153,244deeff09..4ecf909368
--- a/builtin/init-db.c
+++ b/builtin/init-db.c
@@@ -7,7 -7,7 +7,7 @@@
  #include "config.h"
  #include "refs.h"
  #include "builtin.h"
 -#include "exec_cmd.h"
 +#include "exec-cmd.h"
  #include "parse-options.h"
  
  #ifndef DEFAULT_GIT_TEMPLATE_DIR
@@@ -117,7 -117,7 +117,7 @@@ static void copy_templates(const char *
  
  	dir = opendir(template_path.buf);
  	if (!dir) {
- 		warning(_("templates not found %s"), template_dir);
+ 		warning(_("templates not found in %s"), template_dir);
  		goto free_return;
  	}
  
@@@ -391,7 -391,7 +391,7 @@@ int init_db(const char *git_dir, const 
  		else if (get_shared_repository() == PERM_EVERYBODY)
  			xsnprintf(buf, sizeof(buf), "%d", OLD_PERM_EVERYBODY);
  		else
 -			die("BUG: invalid value for shared_repository");
 +			BUG("invalid value for shared_repository");
  		git_config_set("core.sharedrepository", buf);
  		git_config_set("receive.denyNonFastforwards", "true");
  	}