Commit 5a13d119 authored by Robert Lyon's avatar Robert Lyon

Adding fix to correct place

parent 0692b589
...@@ -22,13 +22,13 @@ echo "" ...@@ -22,13 +22,13 @@ echo ""
# that exists when the patch was made. # that exists when the patch was made.
HEAD=`git rev-parse HEAD` HEAD=`git rev-parse HEAD`
the_list=`git log --pretty=format:'%H' origin/$GERRIT_BRANCH..$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 firstcommit=1
while IFS= read -r line while IFS= read -r line
do do
if [ -z "$line" ]; then
echo "Patch already merged"
exit 1;
fi
# check if the commit or it's parents have been rejected # check if the commit or it's parents have been rejected
php=`which php` php=`which php`
outcome=`$php $HOME/mahara/mahara-scripts/jenkins/gerrit_query.php -- $line $firstcommit` outcome=`$php $HOME/mahara/mahara-scripts/jenkins/gerrit_query.php -- $line $firstcommit`
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment