diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2017-07-23 08:01:41 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2017-07-24 15:10:15 +0000 |
| commit | 948fad02d11ba422e180f4f15faf068eb4e69b9d (patch) | |
| tree | dac0261cc3c9d3305cc30788ccccba6a4fd1e608 /src/plugins/git/gitgrep.cpp | |
| parent | 99af4ae8e69db2e494cc8192b0b489c681456d91 (diff) | |
Git: Recurse into submodules on grep if applicable (Git >= 2.13)
Change-Id: I5028d6a46749b22cc0e0f5707c9e283126511902
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src/plugins/git/gitgrep.cpp')
| -rw-r--r-- | src/plugins/git/gitgrep.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/git/gitgrep.cpp b/src/plugins/git/gitgrep.cpp index 9e09c7a90a5..59b1fb95663 100644 --- a/src/plugins/git/gitgrep.cpp +++ b/src/plugins/git/gitgrep.cpp @@ -144,7 +144,8 @@ public: GitClient *client = GitPlugin::client(); QStringList arguments = { "-c", "color.grep.match=bold red", - "grep", "-zn", "--no-full-name", "--color=always" + "-c", "color.grep=always", + "grep", "-zn", "--no-full-name" }; if (!(m_parameters.flags & FindCaseSensitively)) arguments << "-i"; @@ -154,6 +155,8 @@ public: arguments << "-P"; else arguments << "-F"; + if (client->gitVersion() >= 0x021300) + arguments << "--recurse-submodules"; arguments << "-e" << m_parameters.text; GitGrepParameters params = m_parameters.searchEngineParameters.value<GitGrepParameters>(); if (!params.ref.isEmpty()) { |