Re: [PATCH v6 00/21] Integrate commit-graph into 'fsck' and 'gc'
- From
Derrick Stolee <stolee@gmail.com>
- Date
- Jun 8, 2018, 15:11 UTC
- Message-ID
- <2d50791e-f957-077e-a5a8-b2a8882f90c5@gmail.com>
- In-Reply-To
- <CANQwDwdRUFnqYva+mvPh8fijcYNGNDRac857aHMhzHUOLeASpw@mail.gmail.com>
On 6/8/2018 11:05 AM, Jakub Narębski wrote:
Show 23 quoted lines
> On Fri, 8 Jun 2018 at 15:56, Derrick Stolee <dstolee@microsoft.com> wrote:
>
>> [..], the following
>> diff occurs from the previous patch:
> [...]
>> diff --git a/t/t5318-commit-graph.sh b/t/t5318-commit-graph.sh
>> index b24e8b6689..9a0661983c 100755
>> --- a/t/t5318-commit-graph.sh
>> +++ b/t/t5318-commit-graph.sh
>> @@ -33,8 +33,8 @@ test_expect_success 'create commits and repack' '
>> '
>>
>> graph_git_two_modes() {
>> - git -c core.commitGraph=true $1 >output
>> - git -c core.commitGraph=false $1 >expect
>> + git -c core.graph=true $1 >output
>> + git -c core.graph=false $1 >expect
>> test_cmp output expect
>> }
> It seems that you have accidentally removed the fix from previous version.
> It needs to be core.commitGraph, not core.graph.
>
>I didn't rebase the fix that I sent as a separate patch [1] (we want that change applied to 'master' while this one targets topics in 'next' and 'pu'). So this specific diff is unfortunate noise.
Thanks! -Stolee
[1] https://public-inbox.org/git/20180604123906.136417-1-dstolee@microsoft.com/ [PATCH] t5318-commit-graph.sh: use core.commitGraph