Commit b61985ad authored by Tim Hockin's avatar Tim Hockin

Ignore untracked files in cherrypick

parent dd378f14
......@@ -33,7 +33,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
......
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