fix: fix delete current branch

UziTech · Nov 23, 2020 · 2593011 · 2593011
1 parent a525418
commit 2593011
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/lib/commands/delete-branch.js b/lib/commands/delete-branch.js
@@ -24,17 +24,17 @@ export default {
 		await helper.checkGitLock(root);
 		const results = [];
 		if (branch.selected) {
-			const defaultBranchName = helper.getDefaultBranch(branches);
-			if (defaultBranchName) {
+			const defaultBranch = helper.getDefaultBranch(branches);
+			if (defaultBranch) {
 				// if branch is current branch then checkout master first
-				if (branch.name === defaultBranchName) {
+				if (branch.name === defaultBranch.name) {
 					branches = await git.branches(root);
 					const br = branches.find(b => !b.selected && b.local);
 					if (br) {
 						results.push(await git.checkoutBranch(root, br.name));
 					}
 				} else {
-					results.push(await git.checkoutBranch(root, defaultBranchName));
+					results.push(await git.checkoutBranch(root, defaultBranch.name));
 				}
 
 				if (results.length > 0) {