Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
scripts
mahara-scripts
Commits
f88cc778
Commit
f88cc778
authored
Mar 08, 2016
by
Robert Lyon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixing mistake with checking how far patch is behind master
Signed-off-by:
Robert Lyon
<
robertl@catalyst.net.nz
>
parent
ea909a7c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
jenkins/mahara_jenkins.php
jenkins/mahara_jenkins.php
+1
-1
No files found.
jenkins/mahara_jenkins.php
View file @
f88cc778
...
...
@@ -48,7 +48,7 @@ passthru_or_die("git fetch origin $GERRIT_BRANCH");
echo
""
;
$behindby
=
shell_exec_or_die
(
"git rev-list HEAD..origin/
$GERRIT_BRANCH
| wc -l"
);
echo
"This patch is behind
$GERRIT_BRANCH
by
$behindby
commit(s)
\n
"
;
if
(
$behindby
<
$MAXBEHIND
)
{
if
(
$behindby
>
$MAXBEHIND
)
{
echo
"This patch is too far behind master, please rebase
\n
"
;
exit
(
1
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment