commit bfbcef08879fd741f0ffde1a7ca7a4eaff7d85da
author Jenkins <jenkins@review.openstack.org> Sun Jan 26 02:43:31 2014 +0000
committer Gerrit Code Review <review@openstack.org> Sun Jan 26 02:43:31 2014 +0000
tree ee6c5b29c81f83fa5f6405da57deadb34c226eb8
parent 813ba48a3ce830306cf847b44883f32b72befb14
parent 0b8f6e0fbba961de04d95ff0e06e515d1ea3ea8b

Merge "Make sure not to revert local changes."

functions

diff --git a/functions b/functions
index 68e552a..73d65ce 100644
--- a/functions
+++ b/functions
@@ -1304,7 +1304,8 @@
     echo "cd $REQUIREMENTS_DIR; $SUDO_CMD python update.py $project_dir"
 
     # Don't update repo if local changes exist
-    (cd $project_dir && git diff --quiet)
+    # Don't use buggy "git diff --quiet"
+    (cd $project_dir && git diff --exit-code >/dev/null)
     local update_requirements=$?
 
     if [ $update_requirements -eq 0 ]; then