@@ -8,6 +8,43 @@ void main() {
88 late RepositoryFixture f;
99 setUp (() async => f = await RepositoryFixture .create ());
1010 tearDown (() async => f.close ());
11+ test (
12+ 'stash rejects changed working contents after review without moving the index or stash ref' ,
13+ () async {
14+ await f.commit ('note.md' , utf8.encode ('base\n ' ), 'base' );
15+ final file = File ('${f .root .path }/note.md' );
16+ await file.writeAsString ('reviewed\n ' );
17+ final reviewed = await f.engine.status (f.repository);
18+ final beforeIndex = await f.git (['ls-files' , '--stage' , '-z' ]);
19+ final request = decodeGitMutation ({
20+ ...StashMutation (
21+ StashAction .create,
22+ expectedHead: reviewed.head,
23+ expectedIndex: reviewed.indexToken,
24+ message: 'Reviewed prose' ,
25+ ).toJson (),
26+ 'expectedWorkingToken' : reviewed.token,
27+ });
28+ await file.writeAsString ('external\n ' );
29+ final result = await f.engine.mutate (f.repository, request);
30+ expect (result.error? .code, GitErrorCode .staleReview);
31+ expect (await file.readAsBytes (), utf8.encode ('external\n ' ));
32+ expect (await f.git (['ls-files' , '--stage' , '-z' ]), beforeIndex);
33+ expect (await f.git (['stash' , 'list' ]), isEmpty);
34+ expect (request.toJson ()['expectedWorkingToken' ], reviewed.token);
35+ final refreshed = await f.engine.status (f.repository);
36+ final retry = await f.engine.mutate (
37+ f.repository,
38+ decodeGitMutation ({
39+ ...request.toJson (),
40+ 'expectedWorkingToken' : refreshed.token,
41+ }),
42+ );
43+ expect (retry.completed, isTrue, reason: '${retry .error }' );
44+ expect (await f.git (['show' , 'refs/stash:note.md' ]), 'external' );
45+ expect (await file.readAsBytes (), utf8.encode ('base\n ' ));
46+ },
47+ );
1148 test (
1249 'recorded and remote submodule updates remain separate from parent staging and commits' ,
1350 () async {
@@ -120,6 +157,7 @@ void main() {
120157 keepIndex: true ,
121158 expectedHead: s.head,
122159 expectedIndex: s.indexToken,
160+ expectedWorkingToken: s.token,
123161 ),
124162 );
125163 expect (outcome.completed, isTrue, reason: '${outcome .error }' );
@@ -141,6 +179,7 @@ void main() {
141179 stagedOnly: true ,
142180 expectedHead: s.head,
143181 expectedIndex: s.indexToken,
182+ expectedWorkingToken: s.token,
144183 ),
145184 );
146185 expect (outcome.completed, isTrue, reason: '${outcome .error }' );
@@ -228,6 +267,7 @@ void main() {
228267 includeUntracked: true ,
229268 expectedHead: s.head,
230269 expectedIndex: s.indexToken,
270+ expectedWorkingToken: s.token,
231271 ),
232272 );
233273 expect (result.completed, isTrue, reason: '${result .error }' );
@@ -244,6 +284,7 @@ void main() {
244284 identity: stash,
245285 expectedHead: s.head,
246286 expectedIndex: s.indexToken,
287+ expectedWorkingToken: s.token,
247288 ),
248289 );
249290 expect (applied.completed, isTrue, reason: '${applied .error }' );
0 commit comments