=== ERROR: Pushed branch does not match BRANCH ===

[edo2313]

I can't understand why it is giving me the error... I successfully pulled manually using git, but the script gives me this error everytime i run it.
Any help?

[vatsh95]

Same here

[vicenteguerra]

¿Do you have more info about this?

[vatsh95]

Hi Edo/Vincenteguerra

I've found the error in the script and solved it,
the error happens at line 60 of deploy.php as we're unable to reference the branch properly.

As it looks like JSON Structure from bitbucket/git has changed and cannot read response properly from branch.

Try replacing the whole IF section with following code:

foreach ($json["push"]["changes"] as $change) {
	if (
		(
			isset($change["old"]["type"])
			&& isset($change["old"]["name"])
			&& $change["old"]["type"] == "branch"
			&& $change["old"]["name"] == "master"
		)
		|| (
			isset($change["new"]["type"])
			&& isset($change["new"]["name"])
			&& $change["new"]["type"] == "branch"
			&& $change["new"]["name"] == "master"
		)
	) {
		exec("git pull https://YOUR_GIT_USERNAME:YOUR_GIT_PASSWORD@bitbucket.org/YOUR_GIT_USER/GIT_NAME.git YOUR_BRANCH_NAME");
		die("Complete.");
	}
}

you can structure your code as per vicenteguerra script as well but i've reduced my script code as i'm just going to pull from specific branch when webhook is called

[3pepe3]

Same here with bitbucket

[ShadowFM]

Hi @vatsh95
can you send your complete deploy.php?

I have the error"Unexpected 'else' (74, 3)" and "syntax error, unexpected 'else' (T_ELSE) (74, 9)"

[renehamburger]

As all changes should relate to the same branch I would think, maybe a check like $json['push']['changes'][0]['new']['name'] === BRANCH is sufficient for bitbucket, as long as BRANCH is set to the raw branch name like 'master'.

[aanderse]

@vicenteguerra do you have any plans to support merge request events? With gitlab the property to compare is "target_branch" instead of "ref".

[JacobDB]

@aanderse can you open a new issue for that?

[aanderse]

@JacobDB certainly: #33

[rocker76]

I am using Bitbucket, and I still get an error.
Only time is recorded in the log file. 17-04-2019 (03:38:59)

Which part is the problem? :(

##deployer.php
// Check for a GitHub signature
if (!empty(TOKEN) && isset($_SERVER["HTTP_X_HUB_SIGNATURE"]) && $token !== hash_hmac($algo, $content, TOKEN)) {
forbid($file, "X-Hub-Signature does not match TOKEN");
// Check for a GitLab token
} elseif (!empty(TOKEN) && isset($_SERVER["HTTP_X_GITLAB_TOKEN"]) && $token !== TOKEN) {
forbid($file, "X-GitLab-Token does not match TOKEN");
// Check for a $_GET token
} elseif (!empty(TOKEN) && isset($_GET["token"]) && $token !== TOKEN) {
forbid($file, "$_GET["token"] does not match TOKEN");
// if none of the above match, but a token exists, exit
} elseif (!empty(TOKEN) && !isset($_SERVER["HTTP_X_HUB_SIGNATURE"]) && !isset($_SERVER["HTTP_X_GITLAB_TOKEN"]) && !isset($_GET["token"])) {
forbid($file, "No token detected");
} else {
// check if pushed branch matches branch specified in config
foreach ($json["push"]["changes"] as $change) {
if (
(
isset($change["old"]["type"])
&& isset($change["old"]["name"])
&& $change["old"]["type"] == "branch"
&& $change["old"]["name"] == "master"
)
|| (
isset($change["new"]["type"])
&& isset($change["new"]["name"])
&& $change["new"]["type"] == "branch"
&& $change["new"]["name"] == "master"
)
) {
exec("git pull origin master");
die("Complete.");
}
}
}

[jordantrizz]

I just tried to set this up for a GitHub repository and it's failing. Printing out the array $json returns nothing. Am I missing anything?

[jordantrizz]

I just tried to set this up for a GitHub repository and it's failing. Printing out the array $json returns nothing. Am I missing anything?

This is because I didn't RTFM. Forgot to change the Content Type to json on the Webhooks screen in the repository. Shwoopsie!