From 1fc4d399ef14b238c39ec61b1cf6ae2e961ad508 Mon Sep 17 00:00:00 2001
From: Eric Amodio <eamodio@gmail.com>
Date: Thu, 13 Jan 2022 23:59:20 -0500
Subject: [PATCH] Forces reset on clear Avoids saving/re-saving object if it
 isn't changing

---
 src/views/nodes/compareBranchNode.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/views/nodes/compareBranchNode.ts b/src/views/nodes/compareBranchNode.ts
index fa0b128..b44908e 100644
--- a/src/views/nodes/compareBranchNode.ts
+++ b/src/views/nodes/compareBranchNode.ts
@@ -181,8 +181,6 @@ export class CompareBranchNode extends ViewNode<BranchesView | CommitsView | Rep
 
 	@log()
 	async clear() {
-		if (this._compareWith == null) return;
-
 		this._compareWith = undefined;
 		await this.updateCompareWith(undefined);
 
@@ -354,6 +352,8 @@ export class CompareBranchNode extends ViewNode<BranchesView | CommitsView | Rep
 			WorkspaceState.BranchComparisons,
 		);
 		if (comparisons == null) {
+			if (compareWith == null) return;
+
 			comparisons = Object.create(null) as BranchComparisons;
 		}
 
@@ -362,6 +362,8 @@ export class CompareBranchNode extends ViewNode<BranchesView | CommitsView | Rep
 		if (compareWith != null) {
 			comparisons[id] = { ...compareWith };
 		} else {
+			if (comparisons[id] == null) return;
+
 			const { [id]: _, ...rest } = comparisons;
 			comparisons = rest;
 		}