mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
t6031: move triple-rename test to t3030
The t6031 test was introduced to check filemode handling of merge-recursive. Much later, an unrelated test was tacked on to look at renames and d/f conflicts. This test does not depend on anything that happened before (it actually blows away any existing content in the test repo). Let's move it to t3030, where there are more related tests. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
441c4a4017
commit
6f50833e98
|
@ -629,5 +629,35 @@ test_expect_failure 'merge-recursive rename vs. rename/symlink' '
|
|||
test_cmp expected actual
|
||||
'
|
||||
|
||||
test_expect_success 'merging with triple rename across D/F conflict' '
|
||||
git reset --hard HEAD &&
|
||||
git checkout -b main &&
|
||||
git rm -rf . &&
|
||||
|
||||
echo "just a file" >sub1 &&
|
||||
mkdir -p sub2 &&
|
||||
echo content1 >sub2/file1 &&
|
||||
echo content2 >sub2/file2 &&
|
||||
echo content3 >sub2/file3 &&
|
||||
mkdir simple &&
|
||||
echo base >simple/bar &&
|
||||
git add -A &&
|
||||
test_tick &&
|
||||
git commit -m base &&
|
||||
|
||||
git checkout -b other &&
|
||||
echo more >>simple/bar &&
|
||||
test_tick &&
|
||||
git commit -a -m changesimplefile &&
|
||||
|
||||
git checkout main &&
|
||||
git rm sub1 &&
|
||||
git mv sub2 sub1 &&
|
||||
test_tick &&
|
||||
git commit -m changefiletodir &&
|
||||
|
||||
test_tick &&
|
||||
git merge other
|
||||
'
|
||||
|
||||
test_done
|
||||
|
|
|
@ -53,35 +53,4 @@ test_expect_success FILEMODE 'verify executable bit on file' '
|
|||
test -x file2
|
||||
'
|
||||
|
||||
test_expect_success 'merging with triple rename across D/F conflict' '
|
||||
git reset --hard HEAD &&
|
||||
git checkout -b main &&
|
||||
git rm -rf . &&
|
||||
|
||||
echo "just a file" >sub1 &&
|
||||
mkdir -p sub2 &&
|
||||
echo content1 >sub2/file1 &&
|
||||
echo content2 >sub2/file2 &&
|
||||
echo content3 >sub2/file3 &&
|
||||
mkdir simple &&
|
||||
echo base >simple/bar &&
|
||||
git add -A &&
|
||||
test_tick &&
|
||||
git commit -m base &&
|
||||
|
||||
git checkout -b other &&
|
||||
echo more >>simple/bar &&
|
||||
test_tick &&
|
||||
git commit -a -m changesimplefile &&
|
||||
|
||||
git checkout main &&
|
||||
git rm sub1 &&
|
||||
git mv sub2 sub1 &&
|
||||
test_tick &&
|
||||
git commit -m changefiletodir &&
|
||||
|
||||
test_tick &&
|
||||
git merge other
|
||||
'
|
||||
|
||||
test_done
|
||||
|
|
Loading…
Reference in a new issue