mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git init: optionally allow a directory argument

Browse Source 
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>
This commit is contained in:
Nanako Shiraishi
2009-07-25 06:59:28 +09:00
committed by Junio C Hamano
parent 0ad8ff2cd1
commit 53d4888593
3 changed files with 129 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
builtin-init-db.c
View File

@ -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;