mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t4200: demonstrate rerere segfault on specially crafted merge

Browse Source 
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Elijah Newren
2018-09-11 11:55:45 -07:00
committed by Junio C Hamano
parent fc54c1af3e
commit 38c93c4d9d
1 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
t/t4200-rerere.sh
View File

@ -580,4 +580,33 @@ test_expect_success 'multiple identical conflicts' '
count_pre_post 0 0
'
test_expect_success 'setup simple stage 1 handling' '
test_create_repo stage_1_handling &&
(
cd stage_1_handling &&
test_seq 1 10 >original &&
git add original &&
git commit -m original &&
git checkout -b A master &&
git mv original A &&
git commit -m "rename to A" &&
git checkout -b B master &&
git mv original B &&
git commit -m "rename to B"
)
'
test_expect_failure 'test simple stage 1 handling' '
(
cd stage_1_handling &&
git config rerere.enabled true &&
git checkout A^0 &&
test_must_fail git merge B^0
)
'
test_done