@gitkraken/core-gitlens 0.24.0 → 0.26.0

package/dist/git-cli/providers/branches.js

@@ -863,7 +863,7 @@ var BranchesGitSubProvider = class {
 				} else if (GitErrors.noMergeBase.test(msg)) {
 					scope?.error(ex, `Unable to merge '${branch}' and '${targetBranch}' as they have no common ancestor`);
 					return createConflictDetectionError("noMergeBase");
-				} else if (ex instanceof GitError) data = ex.stdout;
+				} else if (ex instanceof GitError && ex.stdout) data = ex.stdout;
 				else {
 					scope?.error(ex);
 					return createConflictDetectionError("other");
@@ -890,7 +890,7 @@ var BranchesGitSubProvider = class {
 	}
 	/** Detects conflicts when an autostash is reapplied onto the tree an integration produced */
 	async getPotentialStashReapplyConflicts(repoPath, ontoTreeOid, cancellation) {
-		if (!await this.git.supports("git:merge-tree:merge-base")) return createConflictDetectionError("unsupported");
+		if (!await this.git.supports("git:merge-tree:trees")) return createConflictDetectionError("unsupported");
 		let stashSha;
 		try {
 			stashSha = (await this.git.run({
@@ -967,7 +967,7 @@ var BranchesGitSubProvider = class {
 					ok: false,
 					reason: "noMergeBase"
 				};
-			} else if (ex instanceof GitError) data = ex.stdout;
+			} else if (ex instanceof GitError && ex.stdout) data = ex.stdout;
 			else {
 				scope?.error(ex, "Failed to execute merge-tree for conflict check");
 				return {
@@ -983,7 +983,7 @@ var BranchesGitSubProvider = class {
 	}
 	async checkForPotentialConflicts(repoPath, commits, targetBranch, cancellation, options) {
 		const scope = getScopedLogger();
-		if (!await this.git.supports("git:merge-tree:merge-base")) return createConflictDetectionError("unsupported");
+		if (!await this.git.supports("git:merge-tree:trees")) return createConflictDetectionError("unsupported");
 		let currentTreeOid;
 		try {
 			currentTreeOid = (await this.git.run({