summaryrefslogtreecommitdiff
path: root/builtin-init-db.c
diff options
context:
space:
mode:
authorNanako Shiraishi <nanako3@lavabit.com>2009-07-25 06:59:28 +0900
committerJunio C Hamano <gitster@pobox.com>2009-07-25 02:17:54 -0700
commit53d48885931614a43e414e1272a7f126f8d0c901 (patch)
treeea3cc2803cac3034168ade392df83e71643daea4 /builtin-init-db.c
parent0ad8ff2cd185e84fd49dd961370411e379681f10 (diff)
downloadgit-53d48885931614a43e414e1272a7f126f8d0c901.tar.gz
git init: optionally allow a directory argument
When starting a new repository, I see my students often say % git init newrepo and curse git. They could say % mkdir newrepo; cd newrepo; git init but allowing it as an obvious short-cut may be nicer. Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-init-db.c')
-rw-r--r--builtin-init-db.c56
1 files changed, 48 insertions, 8 deletions
diff --git a/builtin-init-db.c b/builtin-init-db.c
index 4a5600631c..b7f708de1f 100644
--- a/builtin-init-db.c
+++ b/builtin-init-db.c
@@ -371,7 +371,7 @@ static int guess_repository_type(const char *git_dir)
}
static const char init_db_usage[] =
-"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--shared[=<permissions>]]";
+"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--shared[=<permissions>]] [directory]";
/*
* If you want to, you can share the DB area with any number of branches.
@@ -384,27 +384,67 @@ int cmd_init_db(int argc, const char **argv, const char *prefix)
const char *git_dir;
const char *template_dir = NULL;
unsigned int flags = 0;
+ int bare_given = 0;
int i;
for (i = 1; i < argc; i++, argv++) {
const char *arg = argv[1];
if (!prefixcmp(arg, "--template="))
template_dir = arg+11;
- else if (!strcmp(arg, "--bare")) {
- static char git_dir[PATH_MAX+1];
- is_bare_repository_cfg = 1;
- setenv(GIT_DIR_ENVIRONMENT, getcwd(git_dir,
- sizeof(git_dir)), 0);
- } else if (!strcmp(arg, "--shared"))
+ else if (!strcmp(arg, "--bare"))
+ bare_given = is_bare_repository_cfg = 1;
+ else if (!strcmp(arg, "--shared"))
init_shared_repository = PERM_GROUP;
else if (!prefixcmp(arg, "--shared="))
init_shared_repository = git_config_perm("arg", arg+9);
else if (!strcmp(arg, "-q") || !strcmp(arg, "--quiet"))
flags |= INIT_DB_QUIET;
- else
+ else if (arg[0] == '-')
usage(init_db_usage);
+ else
+ break;
}
+ if (i == argc - 1) {
+ int mkdir_tried = 0;
+ retry:
+ if (chdir(argv[1]) < 0) {
+ if (!mkdir_tried) {
+ int saved;
+ /*
+ * At this point we haven't read any configuration,
+ * and we know shared_repository should always be 0;
+ * but just in case we play safe.
+ */
+ saved = shared_repository;
+ shared_repository = 0;
+ switch (safe_create_leading_directories_const(argv[1])) {
+ case -3:
+ errno = EEXIST;
+ /* fallthru */
+ case -1:
+ die_errno("cannot mkdir %s", argv[1]);
+ break;
+ default:
+ break;
+ }
+ shared_repository = saved;
+ if (mkdir(argv[1], 0777) < 0)
+ die_errno("cannot mkdir %s", argv[1]);
+ mkdir_tried = 1;
+ goto retry;
+ }
+ die_errno("cannot chdir to %s", argv[1]);
+ }
+ } else if (i < argc - 1) {
+ usage(init_db_usage);
+ }
+ if (bare_given == 1) {
+ static char git_dir[PATH_MAX+1];
+
+ setenv(GIT_DIR_ENVIRONMENT,
+ getcwd(git_dir, sizeof(git_dir)), 0);
+ }
if (init_shared_repository != -1)
shared_repository = init_shared_repository;