commit 01c7f0b6165e3d5e667a3250dacee94de3460c3c
author Christoffer Quist Adamsen <christofferqa@google.com> Thu Jan 10 10:59:16 2019 +0100
committer Christoffer Quist Adamsen <christofferqa@google.com> Thu Jan 10 10:59:16 2019 +0100
tree 027b85b8f0279cfd93d6ed28da9e6504cc913c4b
parent a57e22c9768b7d65d2e61aa58d3bca4d1fc5d921

Use git pull --no-edit in run_on_as_app.py

Change-Id: Iba96fba5f702ef716d2262a46960626e5445b0c4

tools/run_on_as_app.py

diff --git a/tools/run_on_as_app.py b/tools/run_on_as_app.py
index 56ea215..02f1682 100755
--- a/tools/run_on_as_app.py
+++ b/tools/run_on_as_app.py
@@ -117,7 +117,8 @@
   return subprocess.check_output(['git', 'clone', git_url]).strip()
 
 def GitPull():
-  return subprocess.call(['git', 'pull']) == 0
+  # Use --no-edit to accept the auto-generated merge message, if any.
+  return subprocess.call(['git', 'pull', '--no-edit']) == 0
 
 def GitCheckout(file):
   return subprocess.check_output(['git', 'checkout', file]).strip()