boost/boost-tasks
2
0
Fork 0
mirror of https://github.com/boostorg/boost-tasks.git synced 2026-01-19 04:02:13 +00:00
Code Issues Projects Releases Wiki Activity

Stop stahing changes to git repos

Browse Source 
I've moved the local changes from the website into the repo, so this shouldn't
be required anymore.
This commit is contained in:
Daniel James
2018-02-12 12:59:49 +00:00
parent fdd9529988
commit 94fb6839fe
1 changed files with 3 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
webhook/webhook.php
View File

@@ -116,19 +116,6 @@ function update_git_checkout($repo_path, $update_method, $branch) {
$repo = new RepoBase($repo_path);
$stash_needed = $repo->commandWithStatus('diff-index --quiet HEAD --');
if ($stash_needed) try {
$result .= "Stashing changes\n";
$result .= $repo->commandWithOutput('stash');
}
catch (\RuntimeException $e) {
echo "Git stash failed\n";
$result .= "git stash failed: {$e->message()}\n";
$failed = true;
return $result;
}
try {
switch($update_method) {
case 'pull':
@@ -139,26 +126,14 @@ function update_git_checkout($repo_path, $update_method, $branch) {
$result .= $repo->commandWithOutput("reset --hard origin/{$branch}");
break;
default:
$result .= "Error: invalid update method: {$update_method}";
$failed = true;
return "Error: invalid update method: {$update_method}";
}
}
catch (\RuntimeException $e) {
echo "Git pull failed\n";
$result .= "git pull failed: {$e->message()}\n";
$failed = true;
return "Git pull failed";
}
if ($stash_needed) try {
$result .= $repo->commandWithOutput('stash pop');
}
catch (\RuntimeException $e) {
echo "Git stash pop failed\n";
$result .= "git stash pop failed: : {$e->message()}\n";
$failed = true;
}
return $failed ? $result : '';
return '';
}
function commit_details($payload) {