fix: Do not attempt pull or push on diverged state

As there's no guarantee that merge can be done automatically
medikoo · Jul 1, 2019 · 481ba58 · 481ba58
1 parent 4d71be5
commit 481ba58
Showing 1 changed file with 2 additions and 8 deletions.
diff --git a/lib/setup-repository.js b/lib/setup-repository.js
@@ -41,21 +41,15 @@ module.exports = async (path, repoUrl, options = {}) => {
 		const { stdoutBuffer } = await runProgram("git", ["status"], { cwd: path });
 		const localStatus = String(stdoutBuffer);
 
-		if (
-			tryPull &&
-			(localStatus.includes("Your branch is behind") || localStatus.includes("have diverged"))
-		) {
+		if (tryPull && localStatus.includes("Your branch is behind")) {
 			await runProgram("git", ["merge", "FETCH_HEAD"], {
 				cwd: path,
 				logger: log.levelRoot.get("git:merge")
 			});
 			report.add("pull");
 		}
 
-		if (
-			tryPush &&
-			(localStatus.includes("Your branch is ahead") || localStatus.includes("have diverged"))
-		) {
+		if (tryPush && localStatus.includes("Your branch is ahead")) {
 			await runProgram("git", ["push"], { cwd: path, logger: log.levelRoot.get("git:push") });
 			report.add("push");
 		}