Merge branch 'rd/init-typo'
authorJunio C Hamano <gitster@pobox.com>
Fri, 1 Jun 2018 06:06:40 +0000 (15:06 +0900)
committerJunio C Hamano <gitster@pobox.com>
Fri, 1 Jun 2018 06:06:40 +0000 (15:06 +0900)
Message fix.

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

1  2 
builtin/init-db.c
diff --combined builtin/init-db.c
index 5a5844c153824b7d311a7ba6e878cfc320002d29,244deeff0901acd2a687da229fbe092fd6310774..4ecf90936822e64998651e4d51d1be9c921dee60
@@@ -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");
        }