@matheusbsbs / matheus-bagliano / commits / 3473ad0cf6

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>

Dennis Kaarsemaker committed Nov 30, 2014 at 15:24 UTC 3473ad0cf6c90917813aba978dada6c10352baaa

3 files changed +19 -1

builtin/checkout.c

@@ -1364,6 +1364,9 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)

1364 if (opts.new_worktree_mode)

1365 opts.new_worktree = NULL;

1366

1367 + if (!opts.new_worktree)

1368 + setup_work_tree();

1369 +

1370 if (conflict_style) {

1371 opts.merge = 1; /* implied */

1372 git_xmerge_config("merge.conflictstyle", conflict_style, NULL);

git.c

+1 -1

@@ -383,7 +383,7 @@ static struct cmd_struct commands[] = {

383 { "check-ignore", cmd_check_ignore, RUN_SETUP | NEED_WORK_TREE },

384 { "check-mailmap", cmd_check_mailmap, RUN_SETUP },

385 { "check-ref-format", cmd_check_ref_format },

386 - { "checkout", cmd_checkout, RUN_SETUP | NEED_WORK_TREE },

386 + { "checkout", cmd_checkout, RUN_SETUP },

387 { "checkout-index", cmd_checkout_index,

388 RUN_SETUP | NEED_WORK_TREE},

389 { "cherry", cmd_cherry, RUN_SETUP },

t/t2025-checkout-to.sh

+15

@@ -81,4 +81,19 @@ test_expect_success 'not die on re-checking out current branch' '

81 )

82 '

84 +test_expect_success 'checkout --to from a bare repo' '

85 + (

86 + git clone --bare . bare &&

87 + cd bare &&

88 + git checkout --to ../there2 -b bare-master master

89 + )

90 +'

91 +

92 +test_expect_success 'checkout from a bare repo without --to' '

93 + (

94 + cd bare &&

95 + test_must_fail git checkout master

96 + )

97 +'

98 +

99 test_done