serialize filewise args to 'grep' and 'git grep' #153
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nasamuffin
force-pushed
the
serialize-greps
branch
2 times, most recently
from
8c85efd
to
f1a905c
Compare
When running tests locally outside of a container (e.g. git clone git-secrets; make test), if a user is already using git-secrets by default in their system config and default gitdir template, tests which expect not to have git-secrets installed will fail. Instead, let's remove all hooks when we create a directory without the testbench's template and ignore the system config which may contain patterns that conflict with the testbench.
nasamuffin
force-pushed
the
serialize-greps
branch
from
f1a905c
to
d0352b2
Compare
|
(still figuring out the GitHub UI, sorry). Can there be a test of the behavior with a high number of files? |
nasamuffin
force-pushed
the
serialize-greps
branch
from
d0352b2
to
da314af
Compare
Still looking for tests as well. |
nasamuffin
force-pushed
the
serialize-greps
branch
2 times, most recently
from
b12b78c
to
788c2f0
Compare
nasamuffin
force-pushed
the
serialize-greps
branch
from
788c2f0
to
92c7cae
Compare
Passing a very long argument list to git-grep can cause it to fail; indeed, it's possible for the list of paths passed by git-secrets to either grep or git-grep to exceed the maximum number of arguments allowed in a user's environment (`getconf ARG_MAX`). Instead, let xargs check that the number of arguments won't exceed the system limit. Signed-off-by: Emily Shaffer <[email protected]>
nasamuffin
force-pushed
the
serialize-greps
branch
from
92c7cae
to
3344748
Compare
jrn
reviewed
Apr 3, 2020
| *) exit 255 ;; | ||
| esac' - \ | ||
| -nwHEI "${options}" "${combined_patterns}" -- | ||
| status=$? |
There was a problem hiding this comment.
May want this to be local. Or:
case $? in
0) ...| } | ||
|
|
||
| # Performs a regular grep, taking into account patterns and recursion. | ||
| # Note: this function returns 1 on success, 0 on error. | ||
| regular_grep() { | ||
| local files=("${@}") patterns=$(load_patterns) action='skip' | ||
| local status=0 |
There was a problem hiding this comment.
likewise, can avoid this temporary variable by using $? directly
|
@nasamuffin Could you rebase this without #155? It would be easier to proceed on the two changes independently. You might also rebase on master to replace my merge commit above. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue #, if available:
Fixes #192
Description of changes:
There is a maximum number of args which can be passed to via the command line. To avoid it when invoking 'git-grep'
or 'grep', let's use xargs to invoke a new process when the number of args exceeds the system limit. Semantically the results should be identical.
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.