Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mahara-scripts
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
mahara
mahara-scripts
Commits
5a13d119
Commit
5a13d119
authored
Oct 09, 2015
by
Robert Lyon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adding fix to correct place
parent
0692b589
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
jenkins/mahara_jenkins.sh
jenkins/mahara_jenkins.sh
+4
-4
No files found.
jenkins/mahara_jenkins.sh
View file @
5a13d119
...
...
@@ -22,13 +22,13 @@ echo ""
# that exists when the patch was made.
HEAD
=
`
git rev-parse HEAD
`
the_list
=
`
git log
--pretty
=
format:
'%H'
origin/
$GERRIT_BRANCH
..
$HEAD
`
if
[
-z
"
$the_lists
"
]
;
then
echo
"The patch has already been merged"
exit
1
;
fi
firstcommit
=
1
while
IFS
=
read
-r
line
do
if
[
-z
"
$line
"
]
;
then
echo
"Patch already merged"
exit
1
;
fi
# check if the commit or it's parents have been rejected
php
=
`
which php
`
outcome
=
`
$php
$HOME
/mahara/mahara-scripts/jenkins/gerrit_query.php
--
$line
$firstcommit
`
...
...
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