Hi Junio
On 9 Oct 2023, at 17:41, Junio C Hamano wrote:
> "John Cai via GitGitGadget" <gitgitgadget@xxxxxxxxx> writes:
>
>> Fix this by initializing the repository in the index state.
>>
>> Changes since V2:
>>
>> * fixed test by using printf instead of echo
>
> Much better than using unportable \n with echo.
>
>> -+ echo "foo\nbar\nbaz" >expect &&
>> ++ printf "foo\nbar\nbaz\n" >expect &&
>
> But if we are using printf, it would be easier to read lines
> separately, which would look more like
>
> printf "%s\n" foo bar baz >expect
>
> And we have
>
> test_write_lines foo bar baz >expect
>
> to make it even more discoverable.
wasn't aware of test_write_lines, thanks.
>
>> + git cat-file -p "$tree:file1" >actual &&
>> + test_cmp expect actual
>> + )
>>
>>
>> merge-ort.c | 1 +
>> t/t4300-merge-tree.sh | 27 +++++++++++++++++++++++++++
>> 2 files changed, 28 insertions(+)
>>
>> diff --git a/merge-ort.c b/merge-ort.c
>> index 7857ce9fbd1..36537256613 100644
>> --- a/merge-ort.c
>> +++ b/merge-ort.c
>> @@ -1902,6 +1902,7 @@ static void initialize_attr_index(struct merge_options *opt)
>> struct index_state *attr_index = &opt->priv->attr_index;
>> struct cache_entry *ce;
>>
>> + attr_index->repo = opt->repo;
>> attr_index->initialized = 1;
>>
>> if (!opt->renormalize)
>> diff --git a/t/t4300-merge-tree.sh b/t/t4300-merge-tree.sh
>> index 57c4f26e461..c3a03e54187 100755
>> --- a/t/t4300-merge-tree.sh
>> +++ b/t/t4300-merge-tree.sh
>> @@ -86,6 +86,33 @@ EXPECTED
>> test_cmp expected actual
>> '
>>
>> +test_expect_success '3-way merge with --attr-source' '
>> + test_when_finished rm -rf 3-way &&
>> + git init 3-way &&
>> + (
>> + cd 3-way &&
>> + test_commit initial file1 foo &&
>> + base=$(git rev-parse HEAD) &&
>> + git checkout -b brancha &&
>> + echo bar >>file1 &&
>> + git commit -am "adding bar" &&
>> + source=$(git rev-parse HEAD) &&
>> + git checkout @{-1} &&
>> + git checkout -b branchb &&
>> + echo baz >>file1 &&
>> + git commit -am "adding baz" &&
>> + merge=$(git rev-parse HEAD) &&
>> + git checkout -b gitattributes &&
>> + test_commit "gitattributes" .gitattributes "file1 merge=union" &&
>
> OK, the branch "gitattributes" will be used to drive merge of file1
> using the union merge to avoid conflicting.
>
>> + git checkout @{-1} &&
>
> But such attribute will only be available in that branch, not in the
> checked out working tree. And then
>
>> + tree=$(git --attr-source=gitattributes merge-tree --write-tree \
>> + --merge-base "$base" --end-of-options "$source" "$merge") &&
>
> we use the gitattributes branch as the tree-ish to take the
> attribute information from. Makes sense.
>
>> + printf "foo\nbar\nbaz\n" >expect &&
>
> I'll squash in the "test_write_lines" change while queuing.
thank you!
John
>
>> + git cat-file -p "$tree:file1" >actual &&
>> + test_cmp expect actual
>> + )
>> +'
>> +
>> test_expect_success 'file change A, B (same)' '
>> git reset --hard initial &&
>> test_commit "change-a-b-same-A" "initial-file" "AAA" &&
>>
>> base-commit: 493f4622739e9b64f24b465b21aa85870dd9dc09
>
> Thanks. Looking good.
