Remove quotes from commit message and allow committing with a diff.
Change-Id: Iaf88bb3b333a9949e95e0d72be9e5a9ead71e405
diff --git a/tools/r8_release.py b/tools/r8_release.py
index 3575edf..0048d52 100755
--- a/tools/r8_release.py
+++ b/tools/r8_release.py
@@ -75,16 +75,25 @@
sed(old_version, version, R8_VERSION_FILE)
subprocess.check_call([
- 'git', 'commit', '-a', '-m', '"Version %s"' % version])
+ 'git', 'commit', '-a', '-m', 'Version %s' % version])
version_diff_output = subprocess.check_output([
'git', 'diff', '%s..HEAD' % commithash])
invalid = version_change_diff(version_diff_output, "master", version)
if invalid:
- print "Unexpected diff content for line:"
- print invalid
- sys.exit(1)
+ print "Unexpected diff:"
+ print "=" * 80
+ print version_diff_output
+ print "=" * 80
+ accept_string = 'THE DIFF IS OK!'
+ input = raw_input(
+ "Accept the additonal diff as part of the release? "
+ "Type '%s' to accept: " % accept_string)
+ if input != accept_string:
+ print "You did not type '%s'" % accept_string
+ print 'Aborting dev release for %s' % version
+ sys.exit(1)
# Double check that we want to push the release.
if not args.dry_run:
