Merge "Don't attempt to open an interactive editor"

2013-12-19 23:12:25 +00:00 · 2013-12-19 23:12:25 +00:00 · 45b21a030b
commit 45b21a030b
parent 762042ccc7 833096afe8
1 changed files with 1 additions and 1 deletions
--- a/modules/jenkins/files/slave_scripts/merge_tags.sh
+++ b/modules/jenkins/files/slave_scripts/merge_tags.sh
@ -23,7 +23,7 @@ then
    git review -s
    git checkout master
    git reset --hard origin/master
-    git merge -s ours $TAG
+    git merge --no-edit -s ours $TAG
    # Get a Change-Id
    GIT_EDITOR=true git commit --amend
    git review -R -t merge/release-tag