From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: "brian m. carlson" <sandals@crustytoothpaste.net>
Cc: git@vger.kernel.org, "René Scharfe" <l.s.r@web.de>,
"Duy Nguyen" <pclouds@gmail.com>
Subject: Re: [PATCH 30/31] Git.pm: make hash size independent
Date: Tue, 12 Feb 2019 11:59:27 +0100 [thread overview]
Message-ID: <87zhr1jmr4.fsf@evledraar.gmail.com> (raw)
In-Reply-To: <20190212012256.1005924-31-sandals@crustytoothpaste.net>
On Tue, Feb 12 2019, brian m. carlson wrote:
> The cat_blob function was matching on exactly 40 hex characters. This
> won't work with SHA-256, which uses 64-character hex object IDs. While
> it should be fine to simply match any number of hex characters since the
> output is space delimited, be extra safe by matching either exactly 40
> or exactly 64 hex characters.
>
> Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
> ---
> perl/Git.pm | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/perl/Git.pm b/perl/Git.pm
> index d856930b2e..62c472e0ce 100644
> --- a/perl/Git.pm
> +++ b/perl/Git.pm
> @@ -980,7 +980,7 @@ sub cat_blob {
> return -1;
> }
>
> - if ($description !~ /^[0-9a-fA-F]{40} \S+ (\d+)$/) {
> + if ($description !~ /^[0-9a-fA-F]{40}(?:[0-9a-fA-F]{24})? \S+ (\d+)$/) {
> carp "Unexpected result returned from git cat-file";
> return -1;
> }
The gitweb code doesn't load Git.pm now, but does anyone know a reason
for why we'd avoid any perl/* dependency in the gitweb code? If not the
regex here & in gitweb could be factored into e.g. a tiny Git::OID
library which would either just expose a $GIT::OID_REGEX, or something
like the sort of interface (might not be worth it) that I suggested in
my feedback to 31/31.
next prev parent reply other threads:[~2019-02-12 10:59 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-12 1:22 [PATCH 00/31] Hash function transition part 16 brian m. carlson
2019-02-12 1:22 ` [PATCH 01/31] t/lib-submodule-update: use appropriate length constant brian m. carlson
2019-02-12 1:22 ` [PATCH 02/31] pack-bitmap: make bitmap header handling hash agnostic brian m. carlson
2019-02-12 1:22 ` [PATCH 03/31] pack-bitmap: convert struct stored_bitmap to object_id brian m. carlson
2019-02-12 1:22 ` [PATCH 04/31] pack-bitmap: replace sha1_to_hex brian m. carlson
2019-02-12 6:37 ` Jeff King
2019-02-13 0:00 ` brian m. carlson
2019-02-14 4:41 ` Jeff King
2019-02-12 1:22 ` [PATCH 05/31] pack-bitmap: switch hard-coded constants to the_hash_algo brian m. carlson
2019-02-12 11:13 ` Ævar Arnfjörð Bjarmason
2019-02-12 1:22 ` [PATCH 06/31] submodule: avoid hard-coded constants brian m. carlson
2019-02-12 1:22 ` [PATCH 07/31] notes-merge: switch to use the_hash_algo brian m. carlson
2019-02-12 1:22 ` [PATCH 08/31] notes: make hash size independent brian m. carlson
2019-02-12 1:37 ` Eric Sunshine
2019-02-12 1:42 ` brian m. carlson
2019-02-12 1:22 ` [PATCH 09/31] notes: replace sha1_to_hex brian m. carlson
2019-02-12 1:22 ` [PATCH 10/31] object-store: rename and expand packed_git's sha1 member brian m. carlson
2019-02-12 3:32 ` Eric Sunshine
2019-02-14 3:33 ` brian m. carlson
2019-02-12 1:22 ` [PATCH 11/31] builtin/name-rev: make hash-size independent brian m. carlson
2019-02-12 1:22 ` [PATCH 12/31] fast-import: " brian m. carlson
2019-02-12 3:44 ` Eric Sunshine
2019-02-12 23:36 ` brian m. carlson
2019-02-12 1:22 ` [PATCH 13/31] fast-import: replace sha1_to_hex brian m. carlson
2019-02-12 1:22 ` [PATCH 14/31] builtin/am: make hash size independent brian m. carlson
2019-02-12 1:22 ` [PATCH 15/31] builtin/pull: make hash-size independent brian m. carlson
2019-02-12 3:47 ` Eric Sunshine
2019-02-12 1:22 ` [PATCH 16/31] http-push: convert to use the_hash_algo brian m. carlson
2019-02-12 1:22 ` [PATCH 17/31] http-backend: allow 64-character hex names brian m. carlson
2019-02-12 1:22 ` [PATCH 18/31] http-push: remove remaining uses of sha1_to_hex brian m. carlson
2019-02-12 1:22 ` [PATCH 19/31] http-walker: replace sha1_to_hex brian m. carlson
2019-02-12 3:51 ` Eric Sunshine
2019-02-12 1:22 ` [PATCH 20/31] http: replace hard-coded constant with the_hash_algo brian m. carlson
2019-02-12 1:22 ` [PATCH 21/31] http: compute hash of downloaded objects using the_hash_algo brian m. carlson
2019-02-12 1:22 ` [PATCH 22/31] http: replace sha1_to_hex brian m. carlson
2019-02-12 1:22 ` [PATCH 23/31] remote-curl: make hash size independent brian m. carlson
2019-02-12 11:11 ` Ævar Arnfjörð Bjarmason
2019-02-12 1:22 ` [PATCH 24/31] archive-tar: " brian m. carlson
2019-02-12 7:20 ` René Scharfe
2019-02-12 17:33 ` René Scharfe
2019-02-13 0:11 ` brian m. carlson
2019-02-12 1:22 ` [PATCH 25/31] archive: convert struct archiver_args to object_id brian m. carlson
2019-02-12 1:22 ` [PATCH 26/31] refspec: make hash size independent brian m. carlson
2019-02-12 1:22 ` [PATCH 27/31] builtin/difftool: use parse_oid_hex brian m. carlson
2019-02-12 8:27 ` Eric Sunshine
2019-02-12 1:22 ` [PATCH 28/31] dir: make untracked cache extension hash size independent brian m. carlson
2019-02-12 11:08 ` Ævar Arnfjörð Bjarmason
2019-02-13 0:30 ` brian m. carlson
2019-02-12 1:22 ` [PATCH 29/31] read-cache: read data in a hash-independent way brian m. carlson
2019-02-12 1:22 ` [PATCH 30/31] Git.pm: make hash size independent brian m. carlson
2019-02-12 10:59 ` Ævar Arnfjörð Bjarmason [this message]
2019-02-18 19:09 ` brian m. carlson
2019-02-18 21:00 ` Ævar Arnfjörð Bjarmason
2019-02-12 1:22 ` [PATCH 31/31] gitweb: " brian m. carlson
2019-02-12 10:57 ` Ævar Arnfjörð Bjarmason
2019-02-12 11:15 ` [PATCH 00/31] Hash function transition part 16 Æ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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87zhr1jmr4.fsf@evledraar.gmail.com \
--to=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=l.s.r@web.de \
--cc=pclouds@gmail.com \
--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.
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 NNTP newsgroup(s).