Thread (18 messages) 18 messages, 4 authors, 2021-12-20

RE: Bug report - Can create worktrees from bare repo / such worktrees can fool is_bare_repository()

flat view

From: <hidden>
Date: 2021-12-19 22:51:24

On December 19, 2021 5:23 PM, Sean Allred wrote:
quoted
what about the comparison code where is_bare_repository_cfg is
compared with 1 (it is a boolean and sometimes set to -1). This would
not generally pass a code review.
I'm sorry, I'm afraid I don't completely follow.  Wouldn't the most
straightforward change be to simply follow the documented
recommendation when we create the worktree config in `git sparse-
checkout init`?  Specifically,

    @@ -374,6 +374,9 @@ static int set_config(enum sparse_checkout_mode
mode)
                           "core.sparseCheckoutCone",
                           mode == MODE_CONE_PATTERNS ? "true" : NULL);

    +    if (is_bare_repository())
    +      git_config_set_in_file_gently(config_path, "core.bare", "false");
    +
         if (mode == MODE_NO_PATTERNS)
             set_sparse_index_config(the_repository, 0);

Are we saying the comparison within is_bare_repository() may not be
appropriate in this case?
I'm suggesting that:

        worktree->is_bare = (is_bare_repository_cfg == 1) ||
                is_bare_repository();

the == 1 comparison should not be done for boolean-style variables. It is an int, but initialized to -1. Unless -1 and 1 mean different things, but that is not really documented.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help