Update rfc.sh to assert divergence.
assert_diverge didn't really _assert_ before, this change causes it to exit if there are no differences from origin/$branch. Change-Id: I2423ecd131b858519d4fa977b580dff511dc9b77 Reviewed-on: https://review.openstack.org/275 Reviewed-by: Monty Taylor <mordred@inaugust.com> Tested-by: Jenkins
This commit is contained in:
parent
efdd9ed515
commit
5033e2a5aa
@ -91,13 +91,16 @@ rebase_changes()
|
||||
|
||||
assert_diverge()
|
||||
{
|
||||
git diff origin/$branch..HEAD | grep -q .;
|
||||
if ! git diff origin/$branch..HEAD | grep -q .
|
||||
then
|
||||
echo "No changes between the current branch and origin/$branch."
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
main()
|
||||
{
|
||||
|
||||
set_hooks_commit_msg;
|
||||
|
||||
check_remote;
|
||||
|
Loading…
x
Reference in New Issue
Block a user