Browse code

Merge "Make sure not to revert local changes."

Jenkins authored on 2014/01/26 11:43:31
Showing 1 changed files
... ...
@@ -1304,7 +1304,8 @@ function setup_develop() {
1304 1304
     echo "cd $REQUIREMENTS_DIR; $SUDO_CMD python update.py $project_dir"
1305 1305
 
1306 1306
     # Don't update repo if local changes exist
1307
-    (cd $project_dir && git diff --quiet)
1307
+    # Don't use buggy "git diff --quiet"
1308
+    (cd $project_dir && git diff --exit-code >/dev/null)
1308 1309
     local update_requirements=$?
1309 1310
 
1310 1311
     if [ $update_requirements -eq 0 ]; then