From: Josh Steadmon <steadmon@google.com>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
Jeff King <peff@peff.net>, Bagas Sanjaya <bagasdotme@gmail.com>
Subject: Re: [PATCH v5 1/6] object-name tests: add tests for ambiguous object blind spots
Date: Thu, 23 Dec 2021 13:51:40 -0800 [thread overview]
Message-ID: <YcTvbH9tjXoJYpVN@google.com> (raw)
In-Reply-To: <patch-v5-1.6-767165d096d-20211125T215529Z-avarab@gmail.com>
On 2021.11.25 23:03, Ævar Arnfjörð Bjarmason wrote:
> Extend the tests for ambiguous objects to check how we handle objects
> where we return OBJ_BAD when trying to parse them. As noted in [1] we
> have a blindspot when it comes to this behavior.
>
> Since we need to add new test data here let's extend these tests to be
> tested under SHA-256, in d7a2fc82491 (t1512: skip test if not using
> SHA-1, 2018-05-13) all of the existing tests were skipped, as they
> rely on specific SHA-1 object IDs.
>
> For these tests it only matters that the first 4 characters of the OID
> prefix are the same for both SHA-1 and SHA-256. This uses strings that
> I mined, and have the same prefix when hashed with both.
>
> 1. https://lore.kernel.org/git/YZwbphPpfGk78w2f@coredump.intra.peff.net/
>
> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
> ---
> t/t1512-rev-parse-disambiguation.sh | 84 +++++++++++++++++++++++++++++
> 1 file changed, 84 insertions(+)
>
> diff --git a/t/t1512-rev-parse-disambiguation.sh b/t/t1512-rev-parse-disambiguation.sh
> index 7891a6becf3..ae1c0cf2b21 100755
> --- a/t/t1512-rev-parse-disambiguation.sh
> +++ b/t/t1512-rev-parse-disambiguation.sh
> @@ -25,6 +25,90 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
>
> . ./test-lib.sh
>
> +test_cmp_failed_rev_parse () {
> + dir=$1
> + rev=$2
> + shift
> +
> + test_must_fail git -C "$dir" rev-parse "$rev" 2>actual.raw &&
> + sed "s/\($rev\)[0-9a-f]*/\1.../g" <actual.raw >actual &&
> + test_cmp expect actual
> +}
> +
> +test_expect_success 'ambiguous blob output' '
> + git init --bare blob.prefix &&
> + (
> + cd blob.prefix &&
> +
> + # Both start with "dead..", under both SHA-1 and SHA-256
> + echo brocdnra | git hash-object -w --stdin &&
> + echo brigddsv | git hash-object -w --stdin &&
These "dead.." objects don't seem to be used later, unless I've missed
something.
> + # Both start with "beef.."
> + echo 1agllotbh | git hash-object -w --stdin &&
> + echo 1bbfctrkc | git hash-object -w --stdin
> + ) &&
> +
> + cat >expect <<-\EOF &&
> + error: short object ID beef... is ambiguous
> + hint: The candidates are:
> + hint: beef... blob
> + hint: beef... blob
> + fatal: ambiguous argument '\''beef...'\'': unknown revision or path not in the working tree.
> + Use '\''--'\'' to separate paths from revisions, like this:
> + '\''git <command> [<revision>...] -- [<file>...]'\''
> + EOF
> + test_cmp_failed_rev_parse blob.prefix beef
> +'
Rather than comparing the entire output (which can be brittle), can we
just grep for the important parts of the error message and compare
those?
> +test_expect_success 'ambiguous loose blob parsed as OBJ_BAD' '
> + git init --bare blob.bad &&
> + (
> + cd blob.bad &&
> +
> + # Both have the prefix "bad0"
> + echo xyzfaowcoh | git hash-object -t bad -w --stdin --literally &&
> + echo xyzhjpyvwl | git hash-object -t bad -w --stdin --literally
> + ) &&
> +
> + cat >expect <<-\EOF &&
> + error: short object ID bad0... is ambiguous
> + hint: The candidates are:
> + fatal: invalid object type
> + EOF
> + test_cmp_failed_rev_parse blob.bad bad0
> +'
> +
> +test_expect_success POSIXPERM 'ambigous zlib corrupt loose blob' '
> + git init --bare blob.corrupt &&
> + (
> + cd blob.corrupt &&
> +
> + # Both have the prefix "cafe"
> + echo bnkxmdwz | git hash-object -w --stdin &&
> + oid=$(echo bmwsjxzi | git hash-object -w --stdin) &&
> +
> + oidf=objects/$(test_oid_to_path "$oid") &&
> + chmod 755 $oidf &&
> + echo broken >$oidf
> + ) &&
> +
> + cat >expect <<-\EOF &&
> + error: short object ID cafe... is ambiguous
> + hint: The candidates are:
> + error: inflate: data stream error (incorrect header check)
> + error: unable to unpack cafe... header
> + error: inflate: data stream error (incorrect header check)
> + error: unable to unpack cafe... header
> + hint: cafe... unknown type
> + hint: cafe... blob
> + fatal: ambiguous argument '\''cafe...'\'': unknown revision or path not in the working tree.
> + Use '\''--'\'' to separate paths from revisions, like this:
> + '\''git <command> [<revision>...] -- [<file>...]'\''
> + EOF
> + test_cmp_failed_rev_parse blob.corrupt cafe
> +'
> +
> if ! test_have_prereq SHA1
> then
> skip_all='not using SHA-1 for objects'
> --
> 2.34.1.838.g779e9098efb
>
next prev parent reply other threads:[~2021-12-23 21:51 UTC|newest]
Thread overview: 90+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-04 1:42 [PATCH 0/2] i18n: improve translatability of ambiguous object output Ævar Arnfjörð Bjarmason
2021-10-04 1:42 ` [PATCH 1/2] object-name tests: tighten up advise() output test Ævar Arnfjörð Bjarmason
2021-10-04 2:52 ` Eric Sunshine
2021-10-04 7:05 ` Jeff King
2021-10-04 1:42 ` [PATCH 2/2] object-name: make ambiguous object output translatable Ævar Arnfjörð Bjarmason
2021-10-04 7:35 ` Jeff King
2021-10-04 8:26 ` Ævar Arnfjörð Bjarmason
2021-10-04 9:29 ` Jeff King
2021-10-04 11:16 ` Ævar Arnfjörð Bjarmason
2021-10-04 12:07 ` Jeff King
2021-10-04 14:27 ` [PATCH v2 0/2] i18n: improve translatability of ambiguous object output Ævar Arnfjörð Bjarmason
2021-10-04 14:27 ` [PATCH v2 1/2] object.[ch]: mark object type names for translation Ævar Arnfjörð Bjarmason
2021-10-04 18:54 ` Eric Sunshine
2021-10-05 9:37 ` Bagas Sanjaya
2021-10-05 15:52 ` Ævar Arnfjörð Bjarmason
2021-10-06 19:05 ` Jeff King
2021-10-06 19:46 ` Junio C Hamano
2021-10-06 20:38 ` Jeff King
2021-10-07 18:06 ` Junio C Hamano
2021-10-04 14:27 ` [PATCH v2 2/2] object-name: make ambiguous object output translatable Ævar Arnfjörð Bjarmason
2021-10-06 19:11 ` Jeff King
2021-10-08 19:34 ` [PATCH v3 0/3] i18n: improve translatability of ambiguous object output Ævar Arnfjörð Bjarmason
2021-10-08 19:34 ` [PATCH v3 1/3] object-name: remove unreachable "unknown type" handling Ævar Arnfjörð Bjarmason
2021-10-08 19:34 ` [PATCH v3 2/3] object-name: make ambiguous object output translatable Ævar Arnfjörð Bjarmason
2021-10-08 19:34 ` [PATCH v3 3/3] object-name: show date for ambiguous tag objects Ævar Arnfjörð Bjarmason
2021-11-22 17:53 ` [PATCH v2 0/3] object-name: make ambiguous object output translatable + show tag date Ævar Arnfjörð Bjarmason
2021-11-22 17:53 ` [PATCH v4 1/3] object-name: remove unreachable "unknown type" handling Ævar Arnfjörð Bjarmason
2021-11-22 22:37 ` Jeff King
2021-11-22 17:53 ` [PATCH v4 2/3] object-name: make ambiguous object output translatable Ævar Arnfjörð Bjarmason
2021-11-22 17:53 ` [PATCH v4 3/3] object-name: show date for ambiguous tag objects Ævar Arnfjörð Bjarmason
2021-11-25 22:03 ` [PATCH v5 0/6] object-name: make ambiguous object output translatable + show tag date Ævar Arnfjörð Bjarmason
2021-11-25 22:03 ` [PATCH v5 1/6] object-name tests: add tests for ambiguous object blind spots Ævar Arnfjörð Bjarmason
2021-12-23 21:51 ` Josh Steadmon [this message]
2021-11-25 22:03 ` [PATCH v5 2/6] object-name: explicitly handle OBJ_BAD in show_ambiguous_object() Ævar Arnfjörð Bjarmason
2021-12-23 21:51 ` Josh Steadmon
2021-12-23 22:42 ` Junio C Hamano
2021-11-25 22:03 ` [PATCH v5 3/6] object-name: make ambiguous object output translatable Ævar Arnfjörð Bjarmason
2021-12-23 21:54 ` [PATCH] fixup! " Josh Steadmon
2021-12-23 22:48 ` Junio C Hamano
2021-11-25 22:03 ` [PATCH v5 4/6] object-name: show date for ambiguous tag objects Ævar Arnfjörð Bjarmason
2021-11-25 22:03 ` [PATCH v5 5/6] object-name: iterate ambiguous objects before showing header Ævar Arnfjörð Bjarmason
2021-11-25 22:03 ` [PATCH v5 6/6] object-name: re-use "struct strbuf" in show_ambiguous_object() Ævar Arnfjörð Bjarmason
2021-12-28 14:34 ` [PATCH v6 0/6] object-name: make ambiguous object output translatable + show tag date Ævar Arnfjörð Bjarmason
2021-12-28 14:34 ` [PATCH v6 1/6] object-name tests: add tests for ambiguous object blind spots Ævar Arnfjörð Bjarmason
2021-12-30 23:36 ` Junio C Hamano
2021-12-28 14:34 ` [PATCH v6 2/6] object-name: explicitly handle OBJ_BAD in show_ambiguous_object() Ævar Arnfjörð Bjarmason
2021-12-28 14:34 ` [PATCH v6 3/6] object-name: make ambiguous object output translatable Ævar Arnfjörð Bjarmason
2021-12-30 23:46 ` Junio C Hamano
2021-12-28 14:35 ` [PATCH v6 4/6] object-name: show date for ambiguous tag objects Ævar Arnfjörð Bjarmason
2021-12-30 21:43 ` Junio C Hamano
2021-12-28 14:35 ` [PATCH v6 5/6] object-name: iterate ambiguous objects before showing header Ævar Arnfjörð Bjarmason
2021-12-28 14:35 ` [PATCH v6 6/6] object-name: re-use "struct strbuf" in show_ambiguous_object() Ævar Arnfjörð Bjarmason
2021-12-28 15:18 ` [PATCH v8 0/7] progress: test fixes / cleanup Ævar Arnfjörð Bjarmason
2021-12-28 15:18 ` [PATCH v8 1/7] leak tests: fix a memory leak in "test-progress" helper Ævar Arnfjörð Bjarmason
2021-12-28 15:18 ` [PATCH v8 2/7] progress.c test helper: add missing braces Ævar Arnfjörð Bjarmason
2021-12-28 15:18 ` [PATCH v8 3/7] progress.c tests: make start/stop commands on stdin Ævar Arnfjörð Bjarmason
2021-12-28 16:25 ` Johannes Altmanninger
2021-12-28 15:19 ` [PATCH v8 4/7] progress.c tests: test some invalid usage Ævar Arnfjörð Bjarmason
2021-12-28 16:33 ` Johannes Altmanninger
2021-12-28 15:19 ` [PATCH v8 5/7] progress.c: add temporary variable from progress struct Ævar Arnfjörð Bjarmason
2021-12-28 16:05 ` René Scharfe
2021-12-28 16:13 ` Johannes Altmanninger
2021-12-28 15:19 ` [PATCH v8 6/7] pack-bitmap-write.c: don't return without stop_progress() Ævar Arnfjörð Bjarmason
2021-12-28 15:19 ` [PATCH v8 7/7] *.c: use isatty(0|2), not isatty(STDIN_FILENO|STDERR_FILENO) Ævar Arnfjörð Bjarmason
2021-12-28 16:47 ` René Scharfe
2021-12-28 23:56 ` Ævar Arnfjörð Bjarmason
2022-01-08 0:45 ` [PATCH v8 0/7] progress: test fixes / cleanup Junio C Hamano
2022-01-12 12:39 ` [PATCH v7 0/6] object-name: make ambiguous object output translatable + show tag date Ævar Arnfjörð Bjarmason
2022-01-12 12:39 ` [PATCH v7 1/6] object-name tests: add tests for ambiguous object blind spots Ævar Arnfjörð Bjarmason
2022-01-13 22:39 ` Junio C Hamano
2022-01-14 12:07 ` Ævar Arnfjörð Bjarmason
2022-01-14 18:45 ` Junio C Hamano
2022-01-12 12:39 ` [PATCH v7 2/6] object-name: explicitly handle OBJ_BAD in show_ambiguous_object() Ævar Arnfjörð Bjarmason
2022-01-12 12:39 ` [PATCH v7 3/6] object-name: make ambiguous object output translatable Ævar Arnfjörð Bjarmason
2022-01-12 12:39 ` [PATCH v7 4/6] object-name: show date for ambiguous tag objects Ævar Arnfjörð Bjarmason
2022-01-13 22:46 ` Junio C Hamano
2022-01-14 12:05 ` Ævar Arnfjörð Bjarmason
2022-01-14 19:04 ` Junio C Hamano
2022-01-14 19:35 ` Ævar Arnfjörð Bjarmason
2022-01-12 12:39 ` [PATCH v7 5/6] object-name: iterate ambiguous objects before showing header Ævar Arnfjörð Bjarmason
2022-01-12 12:39 ` [PATCH v7 6/6] object-name: re-use "struct strbuf" in show_ambiguous_object() Ævar Arnfjörð Bjarmason
2022-01-27 5:26 ` [PATCH v8 0/7] object-name: make ambiguous object output translatable + show tag date Ævar Arnfjörð Bjarmason
2022-01-27 5:26 ` [PATCH v8 1/7] object-name tests: add tests for ambiguous object blind spots Ævar Arnfjörð Bjarmason
2022-01-27 5:26 ` [PATCH v8 2/7] object-name: explicitly handle OBJ_BAD in show_ambiguous_object() Ævar Arnfjörð Bjarmason
2022-01-27 5:26 ` [PATCH v8 3/7] object-name: explicitly handle bad tags " Ævar Arnfjörð Bjarmason
2022-01-27 5:26 ` [PATCH v8 4/7] object-name: make ambiguous object output translatable Ævar Arnfjörð Bjarmason
2022-01-27 5:26 ` [PATCH v8 5/7] object-name: show date for ambiguous tag objects Ævar Arnfjörð Bjarmason
2022-01-27 5:26 ` [PATCH v8 6/7] object-name: iterate ambiguous objects before showing header Ævar Arnfjörð Bjarmason
2022-01-27 5:26 ` [PATCH v8 7/7] object-name: re-use "struct strbuf" in show_ambiguous_object() Ævar Arnfjörð Bjarmason
2022-01-27 20:14 ` [PATCH v8 0/7] object-name: make ambiguous object output translatable + show tag date 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=YcTvbH9tjXoJYpVN@google.com \
--to=steadmon@google.com \
--cc=avarab@gmail.com \
--cc=bagasdotme@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.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).