Better git branch command

phpfui · phpfui · commit a988936e3d02 · 2021-07-21T22:30:58.000-04:00
diff --git a/src/PHPFUI/InstaDoc/Section/Git.php b/src/PHPFUI/InstaDoc/Section/Git.php
@@ -21,7 +21,7 @@ public function generate(\PHPFUI\InstaDoc\PageInterface $page, string $fullClass
 		try
 			{
 			$repo = new \Gitonomy\Git\Repository($this->controller->getGitRoot());
-			$result = $repo->run('show-branch');
+			$branch = \trim($repo->run('rev-parse', ['--abbrev-ref', 'HEAD']));
 			}
 		catch (\Exception $e)
 			{
@@ -31,8 +31,6 @@ public function generate(\PHPFUI\InstaDoc\PageInterface $page, string $fullClass
 			return $container;
 			}
 
-		$branch = \substr($result, \strpos($result, '[') + 1, \strpos($result, ']') - 1);
-
 		if (! $branch)
 			{
 			$container->add(new \PHPFUI\SubHeader("Invalid branch name: {$branch}"));

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public function generate(\PHPFUI\InstaDoc\PageInterface $page, string $fullClass`
`21`	`21`	`try`
`22`	`22`	`{`
`23`	`23`	`$repo = new \Gitonomy\Git\Repository($this->controller->getGitRoot());`
`24`		`- $result = $repo->run('show-branch');`
	`24`	`+ $branch = \trim($repo->run('rev-parse', ['--abbrev-ref', 'HEAD']));`
`25`	`25`	`}`
`26`	`26`	`catch (\Exception $e)`
`27`	`27`	`{`
`@@ -31,8 +31,6 @@ public function generate(\PHPFUI\InstaDoc\PageInterface $page, string $fullClass`
`31`	`31`	`return $container;`
`32`	`32`	`}`
`33`	`33`
`34`		`- $branch = \substr($result, \strpos($result, '[') + 1, \strpos($result, ']') - 1);`
`35`		`-`
`36`	`34`	`if (! $branch)`
`37`	`35`	`{`
`38`	`36`	`$container->add(new \PHPFUI\SubHeader("Invalid branch name: {$branch}"));`