From: "brian m. carlson" <sandals@crustytoothpaste.net> To: "Martin Ågren" <martin.agren@gmail.com> Cc: git@vger.kernel.org, Jeff King <peff@peff.net> Subject: Re: [PATCH 2/3] setup: do not use invalid `repository_format` Date: Wed, 19 Dec 2018 00:18:01 +0000 [thread overview] Message-ID: <20181219001801.GA520988@genre.crustytoothpaste.net> (raw) In-Reply-To: <20181218072528.3870492-3-martin.agren@gmail.com> [-- Attachment #1: Type: text/plain, Size: 1085 bytes --] On Tue, Dec 18, 2018 at 08:25:27AM +0100, Martin Ågren wrote: > I fully admit to not understanding all of this setup code, neither in > its current incarnation, nor in terms of an ideal end game. This check > seems like a good thing to do though. It's definitely complex. > diff --git a/setup.c b/setup.c > index 27747af7a3..52c3c9d31f 100644 > --- a/setup.c > +++ b/setup.c > @@ -1138,7 +1138,7 @@ const char *setup_git_directory_gently(int *nongit_ok) > gitdir = DEFAULT_GIT_DIR_ENVIRONMENT; > setup_git_env(gitdir); > } > - if (startup_info->have_repository) > + if (startup_info->have_repository && repo_fmt.version > -1) > repo_set_hash_algo(the_repository, repo_fmt.hash_algo); > } I think this change is fine, because we initialize the value in the_repository elsewhere, and if there's no repository, this should never have a value other than the default anyway. I looked at the other patches in the series and thought they looked sane as well. -- brian m. carlson: Houston, Texas, US OpenPGP: https://keybase.io/bk2204 [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 868 bytes --]
next prev parent reply other threads:[~2018-12-19 0:18 UTC|newest] Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-12-18 7:25 [PATCH 0/3] setup: add `clear_repository_format()` Martin Ågren 2018-12-18 7:25 ` [PATCH 1/3] setup: drop return value from `read_repository_format()` Martin Ågren 2018-12-19 15:27 ` Jeff King 2018-12-19 21:42 ` Martin Ågren 2018-12-20 0:17 ` brian m. carlson 2018-12-20 2:52 ` Jeff King 2018-12-20 3:45 ` brian m. carlson 2018-12-20 14:53 ` Jeff King 2018-12-18 7:25 ` [PATCH 2/3] setup: do not use invalid `repository_format` Martin Ågren 2018-12-19 0:18 ` brian m. carlson [this message] 2018-12-19 21:43 ` Martin Ågren 2018-12-19 15:38 ` Jeff King 2018-12-19 21:46 ` Martin Ågren 2018-12-19 23:17 ` Jeff King 2018-12-20 0:21 ` brian m. carlson 2018-12-18 7:25 ` [PATCH 3/3] setup: add `clear_repository_format()` Martin Ågren 2018-12-19 15:48 ` Jeff King 2018-12-19 21:49 ` Martin Ågren 2019-01-14 18:34 ` [PATCH v2 0/3] " Martin Ågren 2019-01-14 18:34 ` [PATCH v2 1/3] setup: free old value before setting `work_tree` Martin Ågren 2019-01-14 18:34 ` [PATCH v2 2/3] setup: do not use invalid `repository_format` Martin Ågren 2019-01-15 19:31 ` Jeff King 2019-01-17 6:31 ` Martin Ågren 2019-01-22 7:07 ` Jeff King 2019-01-22 13:34 ` Martin Ågren 2019-01-22 21:45 ` [PATCH v3 0/2] setup: fix memory leaks with `struct repository_format` Martin Ågren 2019-01-22 21:45 ` [PATCH v3 1/2] setup: free old value before setting `work_tree` Martin Ågren 2019-01-22 21:45 ` [PATCH v3 2/2] setup: fix memory leaks with `struct repository_format` Martin Ågren 2019-01-23 5:57 ` Jeff King 2019-01-24 0:14 ` brian m. carlson 2019-01-25 19:25 ` Martin Ågren 2019-01-25 19:24 ` Martin Ågren 2019-01-25 19:51 ` Jeff King 2019-02-25 19:21 ` Martin Ågren 2019-02-26 17:46 ` Jeff King 2019-02-28 20:36 ` [PATCH v4 0/2] " Martin Ågren 2019-02-28 20:36 ` [PATCH v4 1/2] setup: free old value before setting `work_tree` Martin Ågren 2019-02-28 20:36 ` [PATCH v4 2/2] setup: fix memory leaks with `struct repository_format` Martin Ågren 2019-03-06 4:56 ` [PATCH v4 0/2] " Jeff King 2019-01-14 18:34 ` [PATCH v2 3/3] setup: add `clear_repository_format()` Martin Ågren
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=20181219001801.GA520988@genre.crustytoothpaste.net \ --to=sandals@crustytoothpaste.net \ --cc=git@vger.kernel.org \ --cc=martin.agren@gmail.com \ --cc=peff@peff.net \ --subject='Re: [PATCH 2/3] setup: do not use invalid `repository_format`' \ /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).