From: Phillip Wood <phillip.wood123@gmail.com>
To: Junio C Hamano <gitster@pobox.com>,
Phillip Wood via GitGitGadget <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, "Derrick Stolee" <dstolee@microsoft.com>,
"René Scharfe" <l.s.r@web.de>, "Elijah Newren" <newren@gmail.com>,
"Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
"Derrick Stolee" <stolee@gmail.com>,
"Bagas Sanjaya" <bagasdotme@gmail.com>,
"Phillip Wood" <phillip.wood@dunelm.org.uk>
Subject: Re: [PATCH v4] sparse index: fix use-after-free bug in cache_tree_verify()
Date: Mon, 18 Oct 2021 10:37:23 +0100 [thread overview]
Message-ID: <3d0ff15e-469d-c659-4b32-295c7645bb8d@gmail.com> (raw)
In-Reply-To: <xmqqilxw1a9v.fsf@gitster.g>
Hi Junio
On 17/10/2021 06:38, Junio C Hamano wrote:
> "Phillip Wood via GitGitGadget" <gitgitgadget@gmail.com> writes:
>
>> [RFC] sparse index: fix use-after-free bug in cache_tree_verify()
>>
>> Changes since V3
>>
>> * removed "-q" from the test [1]. This is the same as V2 with a typo
>> fixed in the commit message
>>
>> [1] https://lore.kernel.org/git/
>> e281c2e2-2044-1a11-e2bc-5ab3ee92c300@gmail.com/
>
> Thanks. Unfortunately I've already merged the previosu version on
> the 11th,
Oh sorry I'd missed that
so I took the liberty of turning this round into an
> incremental. How does this look?
It looks fine to me with Stolee's typo fixes
Thanks
Phillip
> ----- >8 --------- >8 --------- >8 --------- >8 -----
> From: Phillip Wood <phillip.wood@dunelm.org.uk>
> Date: Sat, 16 Oct 2021 09:07:09 +0000
> Subject: [PATCH] t1092: run "rebase --apply" without "-q" in the test
>
> We run a few Git subcommands and make sure they produce identical
> results with and without sparse-index. To this set of subcommands,
> an earlier commit added "rebase --apply", but did so with the "-q"
> option, in order to work around a breakge caused by a version used
> at Microsoft with some unreleased changes.
>
> Because we would want to make sure the commands produce indentical
> results, including reports given to the output that lists which
> commits were picked, use of "-q" loses too much interesting
> information. Let's drop "-q" from the command invocation and
> revisit the issue when the problematic changes are upstreamed.
>
> Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
> Helped-by: Derrick Stolee <dstolee@microsoft.com>
> Signed-off-by: Junio C Hamano <gitster@pobox.com>
> ---
> t/t1092-sparse-checkout-compatibility.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/t/t1092-sparse-checkout-compatibility.sh b/t/t1092-sparse-checkout-compatibility.sh
> index 80c77bb432..85d5279b33 100755
> --- a/t/t1092-sparse-checkout-compatibility.sh
> +++ b/t/t1092-sparse-checkout-compatibility.sh
> @@ -484,7 +484,7 @@ test_expect_success 'checkout and reset (mixed) [sparse]' '
> test_expect_success 'merge, cherry-pick, and rebase' '
> init_repos &&
>
> - for OPERATION in "merge -m merge" cherry-pick "rebase --apply -q" "rebase --merge"
> + for OPERATION in "merge -m merge" cherry-pick "rebase --apply" "rebase --merge"
> do
> test_all_match git checkout -B temp update-deep &&
> test_all_match git $OPERATION update-folder1 &&
>
prev parent reply other threads:[~2021-10-18 9:37 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-06 9:29 [PATCH] [RFC] sparse index: fix use-after-free bug in cache_tree_verify() Phillip Wood via GitGitGadget
2021-10-06 11:20 ` Derrick Stolee
2021-10-06 14:01 ` Phillip Wood
2021-10-06 14:19 ` Derrick Stolee
2021-10-06 19:17 ` Junio C Hamano
2021-10-06 20:43 ` Derrick Stolee
2021-10-07 9:50 ` [PATCH v2] " Phillip Wood via GitGitGadget
2021-10-07 13:35 ` Derrick Stolee
2021-10-07 14:59 ` Phillip Wood
2021-10-07 13:53 ` Derrick Stolee
2021-10-07 15:05 ` Phillip Wood
2021-10-07 15:44 ` Derrick Stolee
2021-10-07 17:59 ` Phillip Wood
2021-10-07 18:07 ` [PATCH v3] " Phillip Wood via GitGitGadget
2021-10-07 21:23 ` Junio C Hamano
2021-10-08 9:09 ` Phillip Wood
2021-10-08 18:53 ` Derrick Stolee
2021-10-08 19:57 ` Junio C Hamano
2021-10-14 13:34 ` Phillip Wood
2021-10-14 16:42 ` Junio C Hamano
2021-10-08 9:38 ` Bagas Sanjaya
2021-10-14 9:40 ` Phillip Wood
2021-10-16 9:07 ` [PATCH v4] " Phillip Wood via GitGitGadget
2021-10-17 5:38 ` Junio C Hamano
2021-10-17 19:35 ` Derrick Stolee
2021-10-18 9:37 ` Phillip Wood [this message]
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=3d0ff15e-469d-c659-4b32-295c7645bb8d@gmail.com \
--to=phillip.wood123@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=bagasdotme@gmail.com \
--cc=dstolee@microsoft.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=l.s.r@web.de \
--cc=newren@gmail.com \
--cc=phillip.wood@dunelm.org.uk \
--cc=stolee@gmail.com \
/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).