Skip to content

K
k3s
Commit b61985ad authored by Tim Hockin's avatar Tim Hockin
Browse files
Options

Ignore untracked files in cherrypick

parent dd378f14
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
hack/cherry_pick_pull.sh
View file @ b61985ad
...@@ -33,7 +33,7 @@ if [[ "$#" -ne 2 ]]; then ...@@ -33,7 +33,7 @@ if [[ "$#" -ne 2 ]]; then
exit 2 exit 2
fi 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." echo "!!! Dirty tree. Clean up and try again."
exit 1 exit 1
fi fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment