@@ -2337,23 +2337,31 @@ it.layer(layerTest)("GitVcsDriver core integration", (it) => {
23372337 } ) ,
23382338 ) ;
23392339
2340- it . effect ( "preserves a staged deletion when the removed path still exists" , ( ) =>
2341- Effect . gen ( function * ( ) {
2342- const cwd = yield * makeTmpDir ( ) ;
2343- yield * initRepoWithCommit ( cwd ) ;
2344- const driver = yield * GitVcsDriver . GitVcsDriver ;
2345- yield * writeTextFile ( cwd , "removed.txt" , "remove me\n" ) ;
2346- yield * git ( cwd , [ "add" , "removed.txt" ] ) ;
2347- yield * git ( cwd , [ "commit" , "-m" , "add removable file" ] ) ;
2348- yield * git ( cwd , [ "rm" , "--cached" , "removed.txt" ] ) ;
2340+ it . effect . each ( [
2341+ { stagedCopy : false , expected : [ "deleted file mode" , "-remove me" ] } ,
2342+ { stagedCopy : true , expected : [ "rename from removed.txt" , "rename to copy.txt" ] } ,
2343+ ] ) (
2344+ "preserves a staged deletion when the removed path still exists (staged copy: $stagedCopy)" ,
2345+ ( { stagedCopy, expected } ) =>
2346+ Effect . gen ( function * ( ) {
2347+ const cwd = yield * makeTmpDir ( ) ;
2348+ yield * initRepoWithCommit ( cwd ) ;
2349+ const driver = yield * GitVcsDriver . GitVcsDriver ;
2350+ yield * writeTextFile ( cwd , "removed.txt" , "remove me\n" ) ;
2351+ yield * git ( cwd , [ "add" , "removed.txt" ] ) ;
2352+ yield * git ( cwd , [ "commit" , "-m" , "add removable file" ] ) ;
2353+ yield * git ( cwd , [ "rm" , "--cached" , "removed.txt" ] ) ;
2354+ if ( stagedCopy ) {
2355+ yield * writeTextFile ( cwd , "copy.txt" , "remove me\n" ) ;
2356+ yield * git ( cwd , [ "add" , "copy.txt" ] ) ;
2357+ }
23492358
2350- const preview = yield * driver . getReviewDiffPreview ( { cwd, ignoreWhitespace : false } ) ;
2351- const diff = preview . sources . find ( ( source ) => source . kind === "working-tree" ) ?. diff ?? "" ;
2359+ const preview = yield * driver . getReviewDiffPreview ( { cwd, ignoreWhitespace : false } ) ;
2360+ const diff = preview . sources . find ( ( source ) => source . kind === "working-tree" ) ?. diff ?? "" ;
23522361
2353- assert . include ( diff , "deleted file mode" ) ;
2354- assert . include ( diff , "-remove me" ) ;
2355- assert . notInclude ( diff , "new file mode" ) ;
2356- } ) ,
2362+ for ( const text of expected ) assert . include ( diff , text ) ;
2363+ assert . notInclude ( diff , "new file mode" ) ;
2364+ } ) ,
23572365 ) ;
23582366
23592367 it . effect . each ( [ false , true ] ) (
0 commit comments