|
|
@ -259,7 +259,7 @@ test_expect_success 'setup for rename + d/f conflicts' ' |
|
|
|
printf "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n" >sub/file && |
|
|
|
printf "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n" >sub/file && |
|
|
|
echo foo >dir/file-in-the-way && |
|
|
|
echo foo >dir/file-in-the-way && |
|
|
|
git add -A && |
|
|
|
git add -A && |
|
|
|
git commit -m "Common commmit" && |
|
|
|
git commit -m "Common commit" && |
|
|
|
|
|
|
|
|
|
|
|
echo 11 >>sub/file && |
|
|
|
echo 11 >>sub/file && |
|
|
|
echo more >>dir/file-in-the-way && |
|
|
|
echo more >>dir/file-in-the-way && |
|
|
@ -439,7 +439,7 @@ test_expect_success 'setup both rename source and destination involved in D/F co |
|
|
|
mkdir one && |
|
|
|
mkdir one && |
|
|
|
echo stuff >one/file && |
|
|
|
echo stuff >one/file && |
|
|
|
git add -A && |
|
|
|
git add -A && |
|
|
|
git commit -m "Common commmit" && |
|
|
|
git commit -m "Common commit" && |
|
|
|
|
|
|
|
|
|
|
|
git mv one/file destdir && |
|
|
|
git mv one/file destdir && |
|
|
|
git commit -m "Renamed to destdir" && |
|
|
|
git commit -m "Renamed to destdir" && |
|
|
@ -479,7 +479,7 @@ test_expect_success 'setup pair rename to parent of other (D/F conflicts)' ' |
|
|
|
echo stuff >one/file && |
|
|
|
echo stuff >one/file && |
|
|
|
echo other >two/file && |
|
|
|
echo other >two/file && |
|
|
|
git add -A && |
|
|
|
git add -A && |
|
|
|
git commit -m "Common commmit" && |
|
|
|
git commit -m "Common commit" && |
|
|
|
|
|
|
|
|
|
|
|
git rm -rf one && |
|
|
|
git rm -rf one && |
|
|
|
git mv two/file one && |
|
|
|
git mv two/file one && |
|
|
@ -539,7 +539,7 @@ test_expect_success 'setup rename of one file to two, with directories in the wa |
|
|
|
|
|
|
|
|
|
|
|
echo stuff >original && |
|
|
|
echo stuff >original && |
|
|
|
git add -A && |
|
|
|
git add -A && |
|
|
|
git commit -m "Common commmit" && |
|
|
|
git commit -m "Common commit" && |
|
|
|
|
|
|
|
|
|
|
|
mkdir two && |
|
|
|
mkdir two && |
|
|
|
>two/file && |
|
|
|
>two/file && |
|
|
@ -583,7 +583,7 @@ test_expect_success 'setup rename one file to two; directories moving out of the |
|
|
|
mkdir one two && |
|
|
|
mkdir one two && |
|
|
|
touch one/file two/file && |
|
|
|
touch one/file two/file && |
|
|
|
git add -A && |
|
|
|
git add -A && |
|
|
|
git commit -m "Common commmit" && |
|
|
|
git commit -m "Common commit" && |
|
|
|
|
|
|
|
|
|
|
|
git rm -rf one && |
|
|
|
git rm -rf one && |
|
|
|
git mv original one && |
|
|
|
git mv original one && |
|
|
@ -618,7 +618,7 @@ test_expect_success 'setup avoid unnecessary update, normal rename' ' |
|
|
|
|
|
|
|
|
|
|
|
printf "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n" >original && |
|
|
|
printf "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n" >original && |
|
|
|
git add -A && |
|
|
|
git add -A && |
|
|
|
git commit -m "Common commmit" && |
|
|
|
git commit -m "Common commit" && |
|
|
|
|
|
|
|
|
|
|
|
git mv original rename && |
|
|
|
git mv original rename && |
|
|
|
echo 11 >>rename && |
|
|
|
echo 11 >>rename && |
|
|
@ -649,7 +649,7 @@ test_expect_success 'setup to test avoiding unnecessary update, with D/F conflic |
|
|
|
mkdir df && |
|
|
|
mkdir df && |
|
|
|
printf "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n" >df/file && |
|
|
|
printf "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n" >df/file && |
|
|
|
git add -A && |
|
|
|
git add -A && |
|
|
|
git commit -m "Common commmit" && |
|
|
|
git commit -m "Common commit" && |
|
|
|
|
|
|
|
|
|
|
|
git mv df/file temp && |
|
|
|
git mv df/file temp && |
|
|
|
rm -rf df && |
|
|
|
rm -rf df && |
|
|
|