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

edo2313 · 2018-07-29T12:33:57Z

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 · 2018-07-30T06:22:41Z

Same here

vicenteguerra · 2018-07-30T23:55:04Z

¿Do you have more info about this?

vatsh95 · 2018-07-31T01:05:17Z

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:[email protected]/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 · 2018-08-20T13:02:25Z

Same here with bitbucket

ShadowFM · 2018-08-26T12:20:45Z

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 · 2018-10-05T21:24:23Z

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 · 2019-04-09T18:38:31Z

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

JacobDB · 2019-04-12T16:00:56Z

@aanderse can you open a new issue for that?

aanderse · 2019-04-12T16:04:13Z

@JacobDB certainly: #33

rocker76 · 2019-04-17T03:47:12Z

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 · 2019-04-17T22:28:49Z

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 · 2019-04-18T17:07:27Z

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!

DarrellBrogdon · 2019-12-10T03:53:20Z

Any status updates on this issue? It's still broken for Bitbucket.

pragmas · 2020-02-25T10:32:12Z

Add this line in deployer.php on line 10:

if (isset($json['push']['changes'][0]['new']['name'])&&empty($json['ref'])) $json['ref']=$json['push']['changes'][0]['new']['name'];

That worked for me.

konkhra · 2021-03-31T07:51:58Z

Add this line in deployer.php on line 10:

if (isset($json['push']['changes'][0]['new']['name'])&&empty($json['ref'])) $json['ref']=$json['push']['changes'][0]['new']['name'];

That worked for me.

Could you be more specific with this? On line 10 in deployer.php I see this:

// retrieve the token

What version do you have?

pragmas · 2021-03-31T12:37:17Z

Add this line in deployer.php on line 10:
if (isset($json['push']['changes'][0]['new']['name'])&&empty($json['ref'])) $json['ref']=$json['push']['changes'][0]['new']['name'];
That worked for me.

Could you be more specific with this? On line 10 in deployer.php I see this:

// retrieve the token

What version do you have?

I added it before the comment:

$DIR = preg_match("//$/", DIR) ? DIR : DIR . "/";

// bitbucket ref issue #23
if (isset($json['push']['changes'][0]['new']['name'])&&empty($json['ref'])) $json['ref']=$json['push']['changes'][0]['new']['name'];

// retrieve the token
if (!$token && isset($_SERVER["HTTP_X_HUB_SIGNATURE"])) {
list($algo, $token) = explode("=", $_SERVER["HTTP_X_HUB_SIGNATURE"], 2) + array("", "");

Serversapollo · 2021-04-05T11:58:36Z

hey , i was getting the same error , and after a few hours i was trying different changes in the code to figure out what was the problem (fun fact it was me) I realized that i was having the Content type from the github webhook settings set to application/x-www-form-urlencoded.
So the "fix" for me was to set the Content type to application/json

konkhra · 2021-04-05T12:10:57Z

hey , i was getting the same error , and after a few hours i was trying different changes in the code to figure out what was the problem (fun fact it was me) I realized that i was having the Content type from the github webhook settings set to application/x-www-form-urlencoded.
So the "fix" for me was to set the Content type to application/json

Are you using bitbucket or github ?

Serversapollo · 2021-04-05T13:48:52Z

hey , i was getting the same error , and after a few hours i was trying different changes in the code to figure out what was the problem (fun fact it was me) I realized that i was having the Content type from the github webhook settings set to application/x-www-form-urlencoded.
So the "fix" for me was to set the Content type to application/json

Are you using bitbucket or github ?

Github

nvjacobo · 2021-05-22T06:53:12Z

Hi,

Same here with gitlab

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

obhishekbatif · 2021-06-13T07:05:56Z

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:[email protected]/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

Are you talking about deployer.php?

renehamburger mentioned this issue Oct 5, 2018

Bitbucket v5.11.1 not working? #22

Closed

JacobDB added bug help wanted labels Apr 12, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

edo2313 commented Jul 29, 2018

vatsh95 commented Jul 30, 2018

vicenteguerra commented Jul 30, 2018

vatsh95 commented Jul 31, 2018 •

edited

Loading

3pepe3 commented Aug 20, 2018 •

edited

Loading

ShadowFM commented Aug 26, 2018

renehamburger commented Oct 5, 2018

aanderse commented Apr 9, 2019

JacobDB commented Apr 12, 2019

aanderse commented Apr 12, 2019

rocker76 commented Apr 17, 2019

jordantrizz commented Apr 17, 2019

jordantrizz commented Apr 18, 2019

DarrellBrogdon commented Dec 10, 2019

pragmas commented Feb 25, 2020

konkhra commented Mar 31, 2021

pragmas commented Mar 31, 2021

Serversapollo commented Apr 5, 2021

konkhra commented Apr 5, 2021

Serversapollo commented Apr 5, 2021

nvjacobo commented May 22, 2021

obhishekbatif commented Jun 13, 2021

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

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

Comments

edo2313 commented Jul 29, 2018

vatsh95 commented Jul 30, 2018

vicenteguerra commented Jul 30, 2018

vatsh95 commented Jul 31, 2018 • edited Loading

3pepe3 commented Aug 20, 2018 • edited Loading

ShadowFM commented Aug 26, 2018

renehamburger commented Oct 5, 2018

aanderse commented Apr 9, 2019

JacobDB commented Apr 12, 2019

aanderse commented Apr 12, 2019

rocker76 commented Apr 17, 2019

jordantrizz commented Apr 17, 2019

jordantrizz commented Apr 18, 2019

DarrellBrogdon commented Dec 10, 2019

pragmas commented Feb 25, 2020

konkhra commented Mar 31, 2021

pragmas commented Mar 31, 2021

Serversapollo commented Apr 5, 2021

konkhra commented Apr 5, 2021

Serversapollo commented Apr 5, 2021

nvjacobo commented May 22, 2021

obhishekbatif commented Jun 13, 2021

vatsh95 commented Jul 31, 2018 •

edited

Loading

3pepe3 commented Aug 20, 2018 •

edited

Loading