diff options
| author | Dennis Kaarsemaker <dennis@kaarsemaker.net> | 2014-11-30 08:24:56 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-12-01 19:00:18 (GMT) |
| commit | 3473ad0cf6c90917813aba978dada6c10352baaa (patch) | |
| tree | a9da5a1234c09008f816b9d1e7e25a82882949e2 /builtin/checkout.c | |
| parent | 6cfbdcb2ab70b238fca9b3811f5b58368fd077c6 (diff) | |
| download | git-3473ad0cf6c90917813aba978dada6c10352baaa.zip git-3473ad0cf6c90917813aba978dada6c10352baaa.tar.gz git-3473ad0cf6c90917813aba978dada6c10352baaa.tar.bz2 | |
checkout: don't require a work tree when checking out into a new one
For normal use cases, it does not make sense for 'checkout' to work on
a bare repository, without a worktree. But "checkout --to" is an
exception because it _creates_ a new worktree. Allow this option to
run on bare repositories.
People who check out from a bare repository should remember that
core.logallrefupdates is off by default and it should be turned back
on. `--to` cannot do this automatically behind the user's back because
some user may deliberately want no reflog.
For people interested in repository setup/discovery code,
is_bare_repository_cfg (aka "core.bare") is unchanged by this patch,
which means 'true' by default for bare repos. Fortunately when we get
the repo through a linked checkout, is_bare_repository_cfg is never
used. So all is still good.
[nd: commit message]
Signed-off-by: Dennis Kaarsemaker <dennis@kaarsemaker.net>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/checkout.c')
| -rw-r--r-- | builtin/checkout.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index 5dfdbda..8c5276c 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -1364,6 +1364,9 @@ int cmd_checkout(int argc, const char **argv, const char *prefix) if (opts.new_worktree_mode) opts.new_worktree = NULL; + if (!opts.new_worktree) + setup_work_tree(); + if (conflict_style) { opts.merge = 1; /* implied */ git_xmerge_config("merge.conflictstyle", conflict_style, NULL); |