opdavies/dotfiles
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

git: Specify target branch using -t or --target

Browse source 
Rather than using an environment variable, use -t or --target to specify
the target branch to merge into (e.g. master, develop, next).
This commit is contained in:
Oliver Davies 2020-05-27 12:03:32 +01:00
parent 54b762b734
commit 01a30f5168
1 changed files with 43 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
bin/git-close-pull-request
View file

@ -1,8 +1,10 @@
#!/usr/bin/env php
<?php
declare(strict_types=1);
/**
* Usage: git close-pull-request
* Usage: git close-pull-request -t <target>
*
* Run this from a branch which has an upstream remote branch, and an associated
* pull request.
@ -28,10 +30,7 @@ class ClosesPullRequests
{
$this->localBranch = exec('git rev-parse --abbrev-ref HEAD');
$this->targetBranch = getenv('TARGET_BRANCH');
if (!$this->targetBranch) {
die('No target branch specified. Aborting.');
}
$this->targetBranch = $this->getTargetBranchFromArgs();
$this->remoteBranch = exec('git rev-parse --abbrev-ref --symbolic-full-name @{u}');
$this->remoteBranch = str_replace('origin/', '', $this->remoteBranch);
@ -51,6 +50,15 @@ class ClosesPullRequests
$this->deleteLocalBranch();
}
private function getTargetBranchFromArgs(): string
{
if (!$targetBranchName = $this->getArg(['-t', '--target'])) {
die('Invalid target branch specified. Aborting.');
}
return $targetBranchName;
}
private function confirmCiStatusIsPassing(): void
{
echo 'Confirming ci-status on PR is green...' . PHP_EOL;
@ -151,6 +159,36 @@ class ClosesPullRequests
echo 'Deleting local branch...' . PHP_EOL;
exec(sprintf('git branch -d %s', $this->localBranch));
}
private function getArg(array $flags): ?string
{
$args = $_SERVER['argv'];
if (!$this->hasArg($flags)) {
return null;
}
$foundArgs = array_intersect($args, $flags);
// Find the position of the first matching argument within the arguments
// array.
$position = array_search(current($foundArgs), $args);
// Return the value by finding the next value. For example:
// [2 => '-t', 3 => 'master']
if (!array_key_exists($position + 1, $args)) {
return null;
}
return $args[$position + 1];
}
private function hasArg(array $flags): bool
{
$args = $_SERVER['argv'];
return !empty(array_intersect($args, $flags));
}
}
(new ClosesPullRequests())->__invoke();