From: Glen Choo <chooglen@google.com> To: Glen Choo via GitGitGadget <gitgitgadget@gmail.com>, git@vger.kernel.org Cc: Taylor Blau <me@ttaylorr.com>, "brian m. carlson" <sandals@crustytoothpaste.net>, Derrick Stolee <derrickstolee@github.com>, Junio C Hamano <gitster@pobox.com>, Emily Shaffer <emilyshaffer@google.com> Subject: Re: [PATCH v2 1/2] setup.c: make bare repo discovery optional Date: Mon, 16 May 2022 11:12:49 -0700 [thread overview] Message-ID: <kl6l1qwtjqhq.fsf@chooglen-macbookpro.roam.corp.google.com> (raw) In-Reply-To: <22b10bf9da8ccf4ae4da634aadfdaff5ee7a3508.1652485058.git.gitgitgadget@gmail.com> "Glen Choo via GitGitGadget" <gitgitgadget@gmail.com> writes: > From: Glen Choo <chooglen@google.com> > > Add a config variable, `discovery.bare`, that tells Git whether or not > it should work with the bare repository it has discovered i.e. Git will > die() if it discovers a bare repository, but it is not allowed by > `discovery.bare`. This only affects repository discovery, thus it has no > effect if discovery was not done (e.g. `--git-dir` was passed). > > This is motivated by the fact that some workflows don't use bare > repositories at all, and users may prefer to opt out of bare repository > discovery altogether: > > - An easy assumption for a user to make is that Git commands run > anywhere inside a repository's working tree will use the same > repository. However, if the working tree contains a bare repository > below the root-level (".git" is preferred at the root-level), any > operations inside that bare repository use the bare repository > instead. > > In the worst case, attackers can use this confusion to trick users > into running arbitrary code (see [1] for a deeper discussion). But > even in benign situations (e.g. a user renames ".git/" to ".git.old/" > and commits it for archival purposes), disabling bare repository > discovery can be a simpler mode of operation (e.g. because the user > doesn't actually want to use ".git.old/") [2]. > > - Git won't "accidentally" recognize a directory that wasn't meant to be > a bare repository, but happens to resemble one. While such accidents > are probably very rare in practice, this lets users reduce the chance > to zero. > > This config is an enum of: > > - ["always"|(unset)]: always recognize bare repositories (like Git does > today) > - "never": never recognize bare repositories > > More values are expected to be added later, and the default is expected > to change (i.e. to something other than "always"). > > [1]: https://lore.kernel.org/git/kl6lsfqpygsj.fsf@chooglen-macbookpro.roam.corp.google.com > [2]: I don't personally know anyone who does this as part of their > normal workflow, but a cursory search on GitHub suggests that there is a > not insubstantial number of people who munge ".git" in order to store > its contents. > > https://github.com/search?l=&o=desc&p=1&q=ref+size%3A%3C1000+filename%3AHEAD&s=indexed&type=Code > (aka search for the text "ref", size:<1000, filename:HEAD) > > Signed-off-by: Glen Choo <chooglen@google.com> The intended commit message ends here... > WIP setup.c: make discovery.bare die on failure > > Signed-off-by: Glen Choo <chooglen@google.com> Ugh, dumb mistake (bad squash). Fortunately this was one of my more professional-sounding WIP commit messages.
next prev parent reply other threads:[~2022-05-16 18:13 UTC|newest] Thread overview: 79+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-05-06 18:30 [PATCH] [RFC] " Glen Choo via GitGitGadget 2022-05-06 20:33 ` Junio C Hamano 2022-05-09 21:42 ` Taylor Blau 2022-05-09 22:54 ` Junio C Hamano 2022-05-09 23:57 ` Taylor Blau 2022-05-10 0:23 ` Junio C Hamano 2022-05-10 22:00 ` Glen Choo 2022-05-13 23:37 ` [PATCH v2 0/2] " Glen Choo via GitGitGadget 2022-05-13 23:37 ` [PATCH v2 1/2] " Glen Choo via GitGitGadget 2022-05-16 18:12 ` Glen Choo [this message] 2022-05-16 18:46 ` Derrick Stolee 2022-05-16 22:25 ` Taylor Blau 2022-05-17 20:24 ` Glen Choo 2022-05-17 21:51 ` Glen Choo 2022-05-13 23:37 ` [PATCH v2 2/2] setup.c: learn discovery.bareRepository=cwd Glen Choo via GitGitGadget 2022-05-16 18:49 ` Derrick Stolee 2022-05-16 16:40 ` [PATCH v2 0/2] setup.c: make bare repo discovery optional Junio C Hamano 2022-05-16 18:36 ` Glen Choo 2022-05-16 19:16 ` Junio C Hamano 2022-05-16 20:27 ` Glen Choo 2022-05-16 22:16 ` Junio C Hamano 2022-05-16 16:43 ` Junio C Hamano 2022-05-16 19:07 ` Derrick Stolee 2022-05-16 22:43 ` Taylor Blau 2022-05-16 23:19 ` Junio C Hamano 2022-05-17 18:56 ` Glen Choo 2022-05-27 21:09 ` [PATCH v3 0/5] config: introduce discovery.bare and protected config Glen Choo via GitGitGadget 2022-05-27 21:09 ` [PATCH v3 1/5] Documentation: define protected configuration Glen Choo via GitGitGadget 2022-05-27 23:29 ` Junio C Hamano 2022-06-02 12:42 ` Derrick Stolee 2022-06-02 16:53 ` Junio C Hamano 2022-06-02 17:39 ` Glen Choo 2022-06-03 15:57 ` Glen Choo 2022-05-27 21:09 ` [PATCH v3 2/5] config: read protected config with `git_protected_config()` Glen Choo via GitGitGadget 2022-05-28 0:28 ` Junio C Hamano 2022-05-31 17:43 ` Glen Choo 2022-06-01 15:58 ` Junio C Hamano 2022-06-02 12:56 ` Derrick Stolee 2022-05-27 21:09 ` [PATCH v3 3/5] setup.c: create `discovery.bare` Glen Choo via GitGitGadget 2022-05-28 0:59 ` Junio C Hamano 2022-06-02 13:11 ` Derrick Stolee 2022-05-27 21:09 ` [PATCH v3 4/5] config: include "-c" in protected config Glen Choo via GitGitGadget 2022-06-02 13:15 ` Derrick Stolee 2022-05-27 21:09 ` [PATCH v3 5/5] upload-pack: make uploadpack.packObjectsHook protected Glen Choo via GitGitGadget 2022-06-02 13:18 ` Derrick Stolee 2022-06-07 20:57 ` [PATCH v4 0/5] config: introduce discovery.bare and protected config Glen Choo via GitGitGadget 2022-06-07 20:57 ` [PATCH v4 1/5] Documentation/git-config.txt: add SCOPES section Glen Choo via GitGitGadget 2022-06-07 20:57 ` [PATCH v4 2/5] Documentation: define protected configuration Glen Choo via GitGitGadget 2022-06-22 21:58 ` Jonathan Tan 2022-06-23 18:21 ` Glen Choo 2022-06-07 20:57 ` [PATCH v4 3/5] config: read protected config with `git_protected_config()` Glen Choo via GitGitGadget 2022-06-07 22:49 ` Junio C Hamano 2022-06-08 0:22 ` Glen Choo 2022-06-07 20:57 ` [PATCH v4 4/5] safe.directory: use git_protected_config() Glen Choo via GitGitGadget 2022-06-07 20:57 ` [PATCH v4 5/5] setup.c: create `discovery.bare` Glen Choo via GitGitGadget 2022-06-07 21:37 ` Glen Choo 2022-06-22 22:03 ` [PATCH v4 0/5] config: introduce discovery.bare and protected config Jonathan Tan 2022-06-23 17:13 ` Glen Choo 2022-06-23 18:32 ` Junio C Hamano 2022-06-27 17:34 ` Glen Choo 2022-06-27 18:19 ` Glen Choo 2022-06-27 18:36 ` [PATCH v5 " Glen Choo via GitGitGadget 2022-06-27 18:36 ` [PATCH v5 1/5] Documentation/git-config.txt: add SCOPES section Glen Choo via GitGitGadget 2022-06-27 18:36 ` [PATCH v5 2/5] Documentation: define protected configuration Glen Choo via GitGitGadget 2022-06-27 18:36 ` [PATCH v5 3/5] config: learn `git_protected_config()` Glen Choo via GitGitGadget 2022-06-27 18:36 ` [PATCH v5 4/5] safe.directory: use git_protected_config() Glen Choo via GitGitGadget 2022-06-27 18:36 ` [PATCH v5 5/5] setup.c: create `discovery.bare` Glen Choo via GitGitGadget 2022-06-30 13:20 ` Ævar Arnfjörð Bjarmason 2022-06-30 17:28 ` Glen Choo 2022-06-30 18:13 ` [PATCH v6 0/5] config: introduce discovery.bare and protected config Glen Choo via GitGitGadget 2022-06-30 18:13 ` [PATCH v6 1/5] Documentation/git-config.txt: add SCOPES section Glen Choo via GitGitGadget 2022-06-30 22:32 ` Taylor Blau 2022-06-30 18:13 ` [PATCH v6 2/5] Documentation: define protected configuration Glen Choo via GitGitGadget 2022-06-30 23:49 ` Taylor Blau 2022-06-30 18:13 ` [PATCH v6 3/5] config: learn `git_protected_config()` Glen Choo via GitGitGadget 2022-06-30 18:13 ` [PATCH v6 4/5] safe.directory: use git_protected_config() Glen Choo via GitGitGadget 2022-06-30 18:13 ` [PATCH v6 5/5] setup.c: create `discovery.bare` Glen Choo via GitGitGadget 2022-06-30 22:13 ` [PATCH v6 0/5] config: introduce discovery.bare and protected config Taylor Blau 2022-06-30 23:07 ` Ævar Arnfjörð Bjarmason
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style List information: http://vger.kernel.org/majordomo-info.html * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=kl6l1qwtjqhq.fsf@chooglen-macbookpro.roam.corp.google.com \ --to=chooglen@google.com \ --cc=derrickstolee@github.com \ --cc=emilyshaffer@google.com \ --cc=git@vger.kernel.org \ --cc=gitgitgadget@gmail.com \ --cc=gitster@pobox.com \ --cc=me@ttaylorr.com \ --cc=sandals@crustytoothpaste.net \ --subject='Re: [PATCH v2 1/2] setup.c: make bare repo discovery optional' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Code repositories for project(s) associated with this inbox: https://80x24.org/mirrors/git.git This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).