diff options
| author | Elijah Newren <newren@gmail.com> | 2018-09-11 20:55:45 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-09-11 22:43:21 +0200 |
| commit | 38c93c4d9d11b881697229d15420fc5c1367d7a9 (patch) | |
| tree | 6c1fa911d1697dec194311db0f49625383f0f2ad /t/t4200-rerere.sh | |
| parent | Git 2.17.1 (diff) | |
| download | git-38c93c4d9d11b881697229d15420fc5c1367d7a9.tar.xz git-38c93c4d9d11b881697229d15420fc5c1367d7a9.zip | |
t4200: demonstrate rerere segfault on specially crafted merge
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4200-rerere.sh')
| -rwxr-xr-x | t/t4200-rerere.sh | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh index d97d2bebc9..ed9e495fa7 100755 --- a/t/t4200-rerere.sh +++ b/t/t4200-rerere.sh @@ -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 |