github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 14:37:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #10963 from thockin/cherrypick-fixes

Browse Source 
Ignore untracked files in cherrypick
This commit is contained in:
Wojciech Tyczynski 2015-07-09 11:28:11 +02:00
commit b33954c45e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hack/cherry_pick_pull.sh
View File

@ -37,7 +37,7 @@ if [[ "$#" -ne 2 ]]; then
exit 2
fi
if git_status=$(git status --porcelain 2>/dev/null) && [[ -n ${git_status} ]]; then
if git_status=$(git status --porcelain --untracked=no 2>/dev/null) && [[ -n "${git_status}" ]]; then
echo "!!! Dirty tree. Clean up and try again."
exit 1
fi