Skip to content

Commit

Permalink
merged from upstream
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelwittig committed May 3, 2016
2 parents 9fa6d45 + fe0d740 commit 05ce6bb
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions git-secrets
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ git_grep() {
local options="$1"; shift
local files=$@ combined_patterns=$(load_combined_patterns)
[ -z "${combined_patterns}" ] && return 1
GREP_OPTIONS= LC_ALL=C git grep -nwHEI ${options} "${combined_patterns}" $files
GREP_OPTIONS= LC_ALL=C git grep -nwHEI ${options} "${combined_patterns}" $@
}

# Performs a regular grep, taking into account patterns and recursion.
Expand All @@ -115,7 +115,7 @@ regular_grep() {
local files=$@ patterns=$(load_patterns) action='skip'
[ -z "${patterns}" ] && return 1
[ "${RECURSIVE}" -eq 1 ] && action="recurse"
GREP_OPTIONS= LC_ALL=C grep -d "${action}" -nwHE "${patterns}" $files
GREP_OPTIONS= LC_ALL=C grep -d "${action}" -nwHEI "${patterns}" $files
}

# Process the given status ($1) and output variables ($2).
Expand Down

0 comments on commit 05ce6bb

Please sign in to comment.