From 78128f9dae3775a8dcd101fc708ef8b5fc45bff3 Mon Sep 17 00:00:00 2001
From: Denis Zaichenko <denis.zaichenko@jetbrains.com>
Date: Wed, 26 Jun 2024 14:27:47 +0200
Subject: [PATCH] [vcs] Don't throw cancellation exception during git log
 disposing, when a commit loading task was already canceled.

GitOrigin-RevId: d1ccb1881c887a9383bbc47052edf1ca76fded5f
---
 .../src/com/intellij/vcs/log/data/SingleTaskController.java     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/SingleTaskController.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/SingleTaskController.java
index 37622a77a8ea..f5c1478d9c00 100644
--- a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/SingleTaskController.java
+++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/SingleTaskController.java
@@ -220,6 +220,8 @@ public abstract class SingleTaskController<Request, Result> implements Disposabl
           LOG.debug(e);
         }
       }
+      catch (CancellationException ignored) {
+      }
       catch (TimeoutException e) {
         if (longTimeOut) LOG.warn(formMessage("Wait time out "), e);
       }