From b61985ad8789fbeb18b8e546d318b77c8096ecb8 Mon Sep 17 00:00:00 2001 From: Tim Hockin Date: Wed, 8 Jul 2015 17:09:14 -0700 Subject: [PATCH] Ignore untracked files in cherrypick --- hack/cherry_pick_pull.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/cherry_pick_pull.sh b/hack/cherry_pick_pull.sh index cf047488bfd..5263831ce70 100755 --- a/hack/cherry_pick_pull.sh +++ b/hack/cherry_pick_pull.sh @@ -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