Merge pull request kubernetes#826 from smarterclayton/git_check_wrong

Check for dirty files is not accurate
duda · Aug 12, 2014 · a3d5d91 · a3d5d91
2 parents c6dcfd5 + aabd368
commit a3d5d91
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/third_party/update.sh b/third_party/update.sh
@@ -2,8 +2,8 @@
 
 set -e
 
-if (( $(git status --porcelain 2>/dev/null | grep "^M" | wc -l) > 0 )); then
-  echo "You can't have any staged files in git when updating packages."
+if ! git diff-index --quiet HEAD -- || test $(git ls-files --exclude-standard --others third_party/src | wc -l) != 0; then
+  echo "You can't have any staged files or changes in third_party/src/ in git when updating packages."
   echo "Either commit them or unstage them to continue."
   exit 1
 fi