From 257d8b632cbc763270626c030703690371a55300 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Tue, 10 Dec 2013 14:01:03 -0800
Subject: [PATCH] Use amend when updating reqs proposal change.

Use git commit --amend when updating an preexisting requirements
proposal update change. Otherwise multiple changes are proposed causing
git review to run interactively and fail (and if it didn't fail multiple
dependent changes would be proposed which we don't want either).

Change-Id: Ic5a173d671ebe25e2bcf2b4972e39879992d3bdf
---
 .../files/slave_scripts/propose_requirements_update.sh      | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/jenkins/files/slave_scripts/propose_requirements_update.sh b/modules/jenkins/files/slave_scripts/propose_requirements_update.sh
index 6433e49a53..ec6b4a72fa 100755
--- a/modules/jenkins/files/slave_scripts/propose_requirements_update.sh
+++ b/modules/jenkins/files/slave_scripts/propose_requirements_update.sh
@@ -69,7 +69,11 @@ EOF
     pushd $PROJECT_DIR
     if ! git diff --quiet ; then
         # Commit and review
-        git commit -a -F- <<EOF
+        git_args="-a -F-"
+        if [ -n "$change_id" ] ; then
+            git_args="--amend $git_args"
+        fi
+        git commit $git_args <<EOF
 $COMMIT_MSG
 EOF
         git review -t $TOPIC $BRANCH