init/clone: remove short option -L and document --separate-git-dir
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nguyen Thai Ngoc Duy committed
May 24, 2011 at 23:40 UTC
09ffc706e48f93ed622a9a61704b2f767666b30d
6 files changed
+6
-8
Documentation/git-clone.txt
+1
-2
@@ -12,7 +12,7 @@ SYNOPSIS
12
'git clone' [--template=<template_directory>]
13
[-l] [-s] [--no-hardlinks] [-q] [-n] [--bare] [--mirror]
14
[-o <name>] [-b <name>] [-u <upload-pack>] [--reference <repository>]
15
- [--separate-git-dir|-L <git dir>]
15
+ [--separate-git-dir <git dir>]
16
[--depth <depth>] [--recursive|--recurse-submodules] [--] <repository>
17
[<directory>]
18
@@ -177,7 +177,6 @@ objects from the source repository into a pack in the cloned repository.
177
repository does not have a worktree/checkout (i.e. if any of
178
`--no-checkout`/`-n`, `--bare`, or `--mirror` is given)
179
180
--L=<git dir>::
180
--separate-git-dir=<git dir>::
181
Instead of placing the cloned repository where it is supposed
182
to be, place the cloned repository at the specified directory,
Documentation/git-init-db.txt
+1
-1
@@ -8,7 +8,7 @@ git-init-db - Creates an empty git repository
8
9
SYNOPSIS
10
--------
11
-'git init-db' [-q | --quiet] [--bare] [--template=<template_directory>] [--shared[=<permissions>]]
11
+'git init-db' [-q | --quiet] [--bare] [--template=<template_directory>] [--separate-git-dir <git dir>] [--shared[=<permissions>]]
12
13
14
DESCRIPTION
Documentation/git-init.txt
+1
-2
@@ -9,7 +9,7 @@ git-init - Create an empty git repository or reinitialize an existing one
9
SYNOPSIS
10
--------
11
'git init' [-q | --quiet] [--bare] [--template=<template_directory>]
12
- [--separate-git-dir|-L <git dir>]
12
+ [--separate-git-dir <git dir>]
13
[--shared[=<permissions>]] [directory]
14
15
@@ -54,7 +54,6 @@ current working directory.
54
Specify the directory from which templates will be used. (See the "TEMPLATE
55
DIRECTORY" section below.)
56
57
--L=<git dir>::
57
--separate-git-dir=<git dir>::
58
59
Instead of initializing the repository where it is supposed to be,
builtin/clone.c
+1
-1
@@ -81,7 +81,7 @@ static struct option builtin_clone_options[] = {
81
"path to git-upload-pack on the remote"),
82
OPT_STRING(0, "depth", &option_depth, "depth",
83
"create a shallow clone of that depth"),
84
- OPT_STRING('L', "separate-git-dir", &real_git_dir, "gitdir",
84
+ OPT_STRING(0, "separate-git-dir", &real_git_dir, "gitdir",
85
"separate git dir from working tree"),
86
87
OPT_END()
builtin/init-db.c
+1
-1
@@ -490,7 +490,7 @@ int cmd_init_db(int argc, const char **argv, const char *prefix)
490
"specify that the git repository is to be shared amongst several users",
491
PARSE_OPT_OPTARG | PARSE_OPT_NONEG, shared_callback, 0},
492
OPT_BIT('q', "quiet", &flags, "be quiet", INIT_DB_QUIET),
493
- OPT_STRING('L', "separate-git-dir", &real_git_dir, "gitdir",
493
+ OPT_STRING(0, "separate-git-dir", &real_git_dir, "gitdir",
494
"separate git dir from working tree"),
495
OPT_END()
496
};
t/t0001-init.sh
+1
-1
@@ -409,7 +409,7 @@ test_expect_success SYMLINKS 're-init to move gitdir symlink' '
409
cd newdir &&
410
mv .git here &&
411
ln -s here .git &&
412
- git init -L ../realgitdir
412
+ git init --separate-git-dir ../realgitdir
413
) &&
414
echo "gitdir: `pwd`/realgitdir" >expected &&
415
test_cmp expected newdir/.git &&