From 833096afe8fe5f9f23c25f0fe1c95687e588660c Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Fri, 13 Dec 2013 19:51:29 -0500 Subject: [PATCH] Don't attempt to open an interactive editor Merging with git can cause git to want to pop you into an editor. That's not cool in a script. Supply --no-edit to cause the commit to just work. Change-Id: Ic70d74c28d1ca16ae21b2a6c141b26d4e68b21f0 --- modules/jenkins/files/slave_scripts/merge_tags.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/jenkins/files/slave_scripts/merge_tags.sh b/modules/jenkins/files/slave_scripts/merge_tags.sh index ec2a707e10..1c492dd89d 100755 --- 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