refactor: Seclude current branch resolve logic

medikoo · Sep 17, 2020 · 5c542a8 · 5c542a8
1 parent 378b1be
commit 5c542a8
Showing 1 changed file with 7 additions and 11 deletions.
diff --git a/lib/private/setup-repository.js b/lib/private/setup-repository.js
@@ -7,6 +7,11 @@ const memoizee    = require("memoizee")
     , rm          = require("fs2/rm")
     , runProgram  = require("../run-program");
 
+const resolveCurrentBranch = async path =>
+	String(
+		(await runProgram("git", ["branch", "--show-current"], { cwd: path })).stdoutBuffer
+	).trim();
+
 module.exports = memoizee(
 	async (packageContext, { multiPackageReposMeta }, inputOptions, { topPackageName }) => {
 		const meta = packageContext.meta.multiPackageRepoName
@@ -23,13 +28,7 @@ module.exports = memoizee(
 			const tryPush = inputOptions.push;
 
 			if (name !== topPackageName) {
-				// Confirm we're on expected branch
-				const currentBranch = String(
-					(await runProgram("git", ["branch", "--show-current"], { cwd: path }))
-						.stdoutBuffer
-				).trim();
-
-				if (currentBranch !== branch) {
+				if ((await resolveCurrentBranch()) !== branch) {
 					log.warning("%s is not at expected %s branch", name, branch);
 					return report;
 				}
@@ -84,10 +83,7 @@ module.exports = memoizee(
 		await runProgram("git", ["clone", repoUrl, path], {
 			logger: log.levelRoot.get("git:clone")
 		});
-		const currentBranch = String(
-			(await runProgram("git", ["branch", "--show-current"], { cwd: path })).stdoutBuffer
-		).trim();
-		if (currentBranch !== branch) {
+		if ((await resolveCurrentBranch()) !== branch) {
 			await runProgram("git", ["checkout", branch], {
 				logger: log.levelRoot.get("git:branch")
 			});