diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-10-18 13:25:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-10-18 13:25:42 -0700 |
| commit | 7906b5c957b239c4332efb8eb183673cdf952f2f (patch) | |
| tree | e0a65cad03c8fb4a82ba54bcb21ee7973ecb4209 | |
| parent | cc7d7183f0a95ef5d7853106515db8b7c495997d (diff) | |
| parent | e95bafc52f095b33b5a283179e08a44279c293d0 (diff) | |
| download | git-7906b5c957b239c4332efb8eb183673cdf952f2f.tar.gz | |
Merge branch 'jc/merge-ort-attr-index-fix'
Fix "git merge-tree" to stop segfaulting when the --attr-source
option is used.
* jc/merge-ort-attr-index-fix:
merge-ort: initialize repo in index state
| -rw-r--r-- | merge-ort.c | 1 | ||||
| -rwxr-xr-x | t/t4300-merge-tree.sh | 27 |
2 files changed, 28 insertions, 0 deletions
diff --git a/merge-ort.c b/merge-ort.c index 7857ce9fbd..3653725661 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 57c4f26e46..9c197260d5 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" && + git checkout @{-1} && + tree=$(git --attr-source=gitattributes merge-tree --write-tree \ + --merge-base "$base" --end-of-options "$source" "$merge") && + test_write_lines foo bar baz >expect && + 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" && |