feat: improve repo update logic

lib/setup-repository.js

@@ -11,18 +11,31 @@ module.exports = async (path, repoUrl, options = {}) => {
 	if (await isDirectory(path)) {
 		if (options.skipGitUpdate) return false;
 		// Confirm directory is clean
-		const { stdout } = await runProgram("git", ["status", "--porcelain"], { cwd: path });
-		if (stdout) {
+		let { stdout: localStatus } = await runProgram("git", ["status", "--porcelain"], {
+			cwd: path
+		});
+		if (localStatus) {
 			throw new DevPackageError(
-				`Cannot proceed with update, repository ${ path } is not clean:\n${
-					stdout.split("\n").map(line => `  ${ line }`).join("\n")
+				`Cannot proceed with update, repository at ${ path } is not clean:\n${
+					localStatus.split("\n").map(line => `  ${ line }`).join("\n")
 				}`
 			);
 		}
 
 		// Update
 		log.info("update repository %s", path);
-		await runProgram("git", ["pull"], { cwd: path, logger: log.levelRoot.get("git:pull") });
+		await runProgram("git", ["remote", "update"], {
+			cwd: path,
+			logger: log.levelRoot.get("git:remote")
+		});
+
+		({ stdout: localStatus } = await runProgram("git", ["status"], { cwd: path }));
+		if (localStatus.includes("Your branch is behind")) {
+			await runProgram("git", ["merge", "FETCH_HEAD"], {
+				cwd: path,
+				logger: log.levelRoot.get("git:merge")
+			});
+		}
 		return false;
 	}
 	log.info("clone repository %s from %s", path, repoUrl);