From 4baaf915df53c1a6130ff54cb602fa21acdddc2c Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Thu, 17 Apr 2014 07:02:46 -0700 Subject: [PATCH] Override user interaction in merge tags job Add the "-y" flag to avoid the "Is this really what you meant to do?" prompt. Change-Id: I3397a6e1266c6c3a5f652d3b343e37073f968dc7 --- 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 47f6dd9dc0..dad31e63dd 100755 --- a/modules/jenkins/files/slave_scripts/merge_tags.sh +++ b/modules/jenkins/files/slave_scripts/merge_tags.sh @@ -26,5 +26,5 @@ then git merge --no-edit -s ours $TAG # Get a Change-Id GIT_EDITOR=true git commit --amend - git review -R -t merge/release-tag + git review -R -y -t merge/release-tag fi