MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[git] IJPL-204934 Ensure proper cleanup of structured activities in GitCheckoutOperation

Browse Source 
GitOrigin-RevId: 3929564f04e7009ce1595a6f70070f81217980bf
This commit is contained in:
Stanislau Palyn
2025-09-08 13:17:27 +00:00
committed by intellij-monorepo-bot
parent 880f53d07f
commit e5535ffc3c
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/branch/GitCheckoutOperation.java
+15 -5
View File
@@ -134,13 +134,23 @@ class GitCheckoutOperation extends GitBranchOperation {
new GitUntrackedFilesOverwrittenByOperationDetector(root);
StructuredIdeActivity checkoutOperation = CHECKOUT_OPERATION.startedWithParent(myProject, activity);
GitCommandResult result = myGit.checkout(repository, myStartPointReference, myNewBranch, false, myDetach, myReset,
localChangesDetector, unmergedFiles, unknownPathspec, untrackedOverwrittenByCheckout);
checkoutOperation.finished();
GitCommandResult result;
try {
result = myGit.checkout(repository, myStartPointReference, myNewBranch, false, myDetach, myReset,
localChangesDetector, unmergedFiles, unknownPathspec, untrackedOverwrittenByCheckout);
}
finally {
checkoutOperation.finished();
}
if (result.success()) {
StructuredIdeActivity vfsRefresh = VFS_REFRESH.startedWithParent(myProject, activity);
updateAndRefreshChangedVfs(repository, startHash);
vfsRefresh.finished();
try {
updateAndRefreshChangedVfs(repository, startHash);
}
finally {
vfsRefresh.finished();
}
markSuccessful(repository);
}
else if (unmergedFiles.isDetected()) {