From: Taylor Blau <me@ttaylorr.com>
To: "brian m. carlson" <sandals@crustytoothpaste.net>
Cc: git@vger.kernel.org, Matheus Tavares <matheus.bernardino@usp.br>
Subject: Re: [PATCH] builtin/clone: avoid failure with GIT_DEFAULT_HASH
Date: Fri, 11 Sep 2020 23:24:48 -0400 [thread overview]
Message-ID: <20200912032448.GB1988@nand.local> (raw)
In-Reply-To: <20200911233815.2808426-1-sandals@crustytoothpaste.net>
On Fri, Sep 11, 2020 at 11:38:15PM +0000, brian m. carlson wrote:
> Neither of those are appealing, so let's tell the repository
> initialization code if we're doing a reinit like this, and if so, to
> clear the extension if we're using SHA-1. This makes sure we produce a
> valid and functional repository and doesn't break any of our other use
> cases.
Your explanation makes sense, and what you're proposing here seems like
a very reasonable path forward. I can't think of anything that would
cause it not to work as expected.
> -void initialize_repository_version(int hash_algo);
> +void initialize_repository_version(int hash_algo, int reinit);
I'm not a huge fan of adding a 'reinit' parameter to a function that
itself begins with the word 'initialize' (why wouldn't you call
'reinitialize_repository_version()' instead?), but seeing as there are
only a couple of callers, maybe it is OK.
Alternatively, I certainly wouldn't complain if you did introduce a new
function and updated the call-site that passes reinit as 1.
> +test_expect_success 'clone with GIT_DEFAULT_HASH' '
> + (
> + sane_unset GIT_DEFAULT_HASH &&
> + git init test
> + ) &&
> + test_commit -C test foo &&
> + git clone test test-clone &&
> + git -C test-clone status
> +'
> +
This test looks very reasonable, and certainly demonstrates the bug and
fix. Thanks.
With or without my nitpick:
Reviewed-by: Taylor Blau <me@ttaylorr.com>
Thanks,
Taylor
next prev parent reply other threads:[~2020-09-12 3:24 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-11 15:17 Posible bug with GIT_DEFAULT_HASH during clone Matheus Tavares
2020-09-11 23:20 ` brian m. carlson
2020-09-11 23:38 ` [PATCH] builtin/clone: avoid failure with GIT_DEFAULT_HASH brian m. carlson
2020-09-12 3:24 ` Taylor Blau [this message]
2020-09-12 19:52 ` brian m. carlson
2020-09-14 21:37 ` Junio C Hamano
2020-09-14 21:44 ` Junio C Hamano
2020-09-15 1:32 ` brian m. carlson
2020-09-15 1:58 ` [PATCH v2] " brian m. carlson
2020-09-15 4:31 ` Junio C Hamano
2020-09-15 22:51 ` brian m. carlson
2020-09-20 22:35 ` [PATCH v3] " brian m. carlson
2020-09-21 4:27 ` Junio C Hamano
2020-09-22 9:17 ` brian m. carlson
2020-09-22 16:27 ` Junio C Hamano
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=20200912032448.GB1988@nand.local \
--to=me@ttaylorr.com \
--cc=git@vger.kernel.org \
--cc=matheus.bernardino@usp.br \
--cc=sandals@crustytoothpaste.net \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public 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).