@@ -2417,23 +2417,31 @@ it.layer(layerTest)("GitVcsDriver core integration", (it) => {
24172417 } ) ,
24182418 ) ;
24192419
2420- it . effect ( "preserves a staged deletion when the removed path still exists" , ( ) =>
2421- Effect . gen ( function * ( ) {
2422- const cwd = yield * makeTmpDir ( ) ;
2423- yield * initRepoWithCommit ( cwd ) ;
2424- const driver = yield * GitVcsDriver . GitVcsDriver ;
2425- yield * writeTextFile ( cwd , "removed.txt" , "remove me\n" ) ;
2426- yield * git ( cwd , [ "add" , "removed.txt" ] ) ;
2427- yield * git ( cwd , [ "commit" , "-m" , "add removable file" ] ) ;
2428- yield * git ( cwd , [ "rm" , "--cached" , "removed.txt" ] ) ;
2420+ it . effect . each ( [
2421+ { stagedCopy : false , expected : [ "deleted file mode" , "-remove me" ] } ,
2422+ { stagedCopy : true , expected : [ "rename from removed.txt" , "rename to copy.txt" ] } ,
2423+ ] ) (
2424+ "preserves a staged deletion when the removed path still exists (staged copy: $stagedCopy)" ,
2425+ ( { stagedCopy, expected } ) =>
2426+ Effect . gen ( function * ( ) {
2427+ const cwd = yield * makeTmpDir ( ) ;
2428+ yield * initRepoWithCommit ( cwd ) ;
2429+ const driver = yield * GitVcsDriver . GitVcsDriver ;
2430+ yield * writeTextFile ( cwd , "removed.txt" , "remove me\n" ) ;
2431+ yield * git ( cwd , [ "add" , "removed.txt" ] ) ;
2432+ yield * git ( cwd , [ "commit" , "-m" , "add removable file" ] ) ;
2433+ yield * git ( cwd , [ "rm" , "--cached" , "removed.txt" ] ) ;
2434+ if ( stagedCopy ) {
2435+ yield * writeTextFile ( cwd , "copy.txt" , "remove me\n" ) ;
2436+ yield * git ( cwd , [ "add" , "copy.txt" ] ) ;
2437+ }
24292438
2430- const preview = yield * driver . getReviewDiffPreview ( { cwd, ignoreWhitespace : false } ) ;
2431- const diff = preview . sources . find ( ( source ) => source . kind === "working-tree" ) ?. diff ?? "" ;
2439+ const preview = yield * driver . getReviewDiffPreview ( { cwd, ignoreWhitespace : false } ) ;
2440+ const diff = preview . sources . find ( ( source ) => source . kind === "working-tree" ) ?. diff ?? "" ;
24322441
2433- assert . include ( diff , "deleted file mode" ) ;
2434- assert . include ( diff , "-remove me" ) ;
2435- assert . notInclude ( diff , "new file mode" ) ;
2436- } ) ,
2442+ for ( const text of expected ) assert . include ( diff , text ) ;
2443+ assert . notInclude ( diff , "new file mode" ) ;
2444+ } ) ,
24372445 ) ;
24382446
24392447 it . effect . each ( [ false , true ] ) (
0 commit comments