summaryrefslogtreecommitdiff
path: root/share
diff options
context:
space:
mode:
authorAdam J. Stewart <ajstewart426@gmail.com>2016-09-23 16:16:59 -0500
committerTodd Gamblin <tgamblin@llnl.gov>2016-09-23 14:16:59 -0700
commit64194a823af1e54951bb67d5d354b4a91d90bc86 (patch)
tree439da8a6ffeb9fcd59d1dde4d38ed0bed1432d1a /share
parent6ef6428331db023cc8f7af2ca5ff86ab488ad777 (diff)
downloadspack-64194a823af1e54951bb67d5d354b4a91d90bc86.tar.gz
spack-64194a823af1e54951bb67d5d354b4a91d90bc86.tar.bz2
spack-64194a823af1e54951bb67d5d354b4a91d90bc86.tar.xz
spack-64194a823af1e54951bb67d5d354b4a91d90bc86.zip
Remove duplicate ICU package (#1837)
* Remove duplicate ICU package * Ignore deleted files during flake8 tests * Rename Boost ICU variant
Diffstat (limited to 'share')
-rwxr-xr-xshare/spack/qa/changed_files6
1 files changed, 3 insertions, 3 deletions
diff --git a/share/spack/qa/changed_files b/share/spack/qa/changed_files
index 9c60b3b20b..c1fa55c053 100755
--- a/share/spack/qa/changed_files
+++ b/share/spack/qa/changed_files
@@ -18,11 +18,11 @@ SPACK_ROOT="$(dirname "$0")/../../.."
cd "$SPACK_ROOT"
# Add changed files that have been committed since branching off of develop
-changed=($(git diff --name-only --find-renames develop... -- "$@"))
+changed=($(git diff --name-only --diff-filter=ACMR develop... -- "$@"))
# Add changed files that have been staged but not yet committed
-changed+=($(git diff --name-only --find-renames --cached -- "$@"))
+changed+=($(git diff --name-only --diff-filter=ACMR --cached -- "$@"))
# Add changed files that are unstaged
-changed+=($(git diff --name-only --find-renames -- "$@"))
+changed+=($(git diff --name-only --diff-filter=ACMR -- "$@"))
# Add new files that are untracked
changed+=($(git ls-files --exclude-standard --other -- "$@"))