Git - fix condition for setting the base branch (microsoft#223493)

nagi1999a · Jul 26, 2024 · a4dae44 · a4dae44
1 parent d5352d5
commit a4dae44
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/extensions/git/src/historyProvider.ts b/extensions/git/src/historyProvider.ts
@@ -90,8 +90,8 @@ export class GitHistoryProvider implements SourceControlHistoryProvider, FileDec
 				revision: this.repository.HEAD.upstream.commit
 			} : undefined,
 			base: mergeBase &&
-				mergeBase.remote !== this.repository.HEAD.upstream?.remote &&
-				mergeBase.name !== this.repository.HEAD.upstream?.name ? {
+				(mergeBase.remote !== this.repository.HEAD.upstream?.remote ||
+					mergeBase.name !== this.repository.HEAD.upstream?.name) ? {
 				id: `refs/remotes/${mergeBase.remote}/${mergeBase.name}`,
 				name: `${mergeBase.remote}/${mergeBase.name}`,
 				revision: mergeBase.commit