Merge commit 'ee08286ecaf76cd11914c5a3e914093b991c32db'

src/PocketMine.php

@@ -25,6 +25,7 @@ namespace pocketmine {
 
 	use pocketmine\thread\ThreadManager;
 	use pocketmine\utils\Filesystem;
+	use pocketmine\utils\Git;
 	use pocketmine\utils\MainLogger;
 	use pocketmine\utils\Process;
 	use pocketmine\utils\ServerKiller;
@@ -194,13 +195,7 @@ namespace pocketmine {
 		$gitHash = str_repeat("00", 20);
 
 		if(\Phar::running(true) === ""){
-			$gitPath = \pocketmine\PATH;
+			$gitHash = Git::getRepositoryStatePretty(\pocketmine\PATH);
-			if(Process::execute("git -C \"$gitPath\" rev-parse HEAD", $out) === 0 and $out !== false and strlen($out = trim($out)) === 40){
-				$gitHash = trim($out);
-				if(Process::execute("git -C \"$gitPath\" diff --quiet") === 1 or Process::execute("git -C \"$gitPath\" diff --cached --quiet") === 1){ //Locally-modified
-					$gitHash .= "-dirty";
-				}
-			}
 		}else{
 			$phar = new \Phar(\Phar::running(false));
 			$meta = $phar->getMetadata();

src/utils/Git.php

@@ -0,0 +1,70 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+declare(strict_types=1);
+
+namespace pocketmine\utils;
+
+use function str_repeat;
+use function strlen;
+use function trim;
+
+final class Git{
+
+	private function __construct(){
+		//NOOP
+	}
+
+	/**
+	 * Returns the git hash of the currently checked out head of the given repository, or null on failure.
+	 *
+	 * @param string $dir
+	 * @param bool   &$dirty Output, set to whether the repo has local changes
+	 *
+	 * @return string|null
+	 */
+	public static function getRepositoryState(string $dir, bool &$dirty) : ?string{
+		if(Process::execute("git -C \"$dir\" rev-parse HEAD", $out) === 0 and $out !== false and strlen($out = trim($out)) === 40){
+			if(Process::execute("git -C \"$dir\" diff --quiet") === 1 or Process::execute("git -C \"$dir\" diff --cached --quiet") === 1){ //Locally-modified
+				$dirty = true;
+			}
+			return $out;
+		}
+		return null;
+	}
+
+	/**
+	 * Infallible, returns a string representing git state, or a string of zeros on failure.
+	 * If the repo is dirty, a "-dirty" suffix is added.
+	 *
+	 * @param string $dir
+	 *
+	 * @return string
+	 */
+	public static function getRepositoryStatePretty(string $dir) : string{
+		$dirty = false;
+		$detectedHash = self::getRepositoryState($dir, $dirty);
+		if($detectedHash !== null){
+			return $detectedHash . ($dirty ? "-dirty" : "");
+		}
+		return str_repeat("00", 20);
+	}
+}