openstack/devstack
Code Issues Proposed changes

Merge "Make sure not to revert local changes."

Browse Source
This commit is contained in:
Jenkins 2014-01-26 02:43:31 +00:00 committed by Gerrit Code Review
commit bfbcef0887
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
functions
View File

@ -1304,7 +1304,8 @@ function setup_develop() {
echo "cd $REQUIREMENTS_DIR; $SUDO_CMD python update.py $project_dir" echo "cd $REQUIREMENTS_DIR; $SUDO_CMD python update.py $project_dir"
# Don't update repo if local changes exist # 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=$? local update_requirements=$?
if [ $update_requirements -eq 0 ]; then if [ $update_requirements -eq 0 ]; then