In `--experimental`, don't report git untracked files as skipped with `--use-git-ignore` by maciejpirog · Pull Request #577 · opengrep/opengrep

maciejpirog · 2026-02-09T17:32:47Z

Closes #575

Before, when run --experimental with --use-git-ignore (default), we always reported that some files were skipped. This was counterintuitive, because it didn't mean that any files were actually skipped.

Now, if the flag is set and the scanned root (more precisely, at least one of the scanned roots) is a git repo, we print the message Scan was limited to files tracked by git separate from the Some files were skipped or only partially analyzed message. This way, when the user sees the latter, it means that there were actually files skipped for a reason (different than not being tracked by git).

Example when both messages appear:

┌──────────────┐
│ Scan Summary │
└──────────────┘
Scan was limited to files tracked by git.
Some files were skipped or only partially analyzed.
  Scan skipped: 76 files matching .semgrepignore patterns.
  For a full list of skipped files, run opengrep with the --verbose flag.

Ran 2 rules on 460 files: 8038 findings.

Example of a scan of a git repo when no files tracked by git are actually skipped:

┌──────────────┐
│ Scan Summary │
└──────────────┘
Scan was limited to files tracked by git.

Ran 1 rules on 2 files: 2 findings.

Example of a scan of a root that is not a git repo, but there are files skipped:

┌──────────────┐
│ Scan Summary │
└──────────────┘
Some files were skipped or only partially analyzed.
  Scan skipped: 1 files larger than 1 MB, 1 files matching .semgrepignore patterns.
  For a full list of skipped files, run opengrep with the --verbose flag.

Ran 2 rules on 5 files: 315 findings.

src/osemgrep/cli_scan/Diff_scan.ml

dimitris-m · 2026-02-09T18:11:57Z

src/osemgrep/cli_scan/Ls_subcommand.ml

-  let selected, skipped = Find_targets.get_target_fpaths conf target_roots in
-  selected |> List.sort Fpath.compare
+  let targets = Find_targets.get_target_fpaths conf target_roots in
+  targets.targets |> List.sort Fpath.compare


maybe targets.selected would be more clear?

and would match targets.skipped

I think you are right. I will change it to selected

dimitris-m · 2026-02-10T22:04:37Z

src/targeting/Find_targets.ml

+(* TODO: The 'git_repo' fields is needed to print out a warning to the *)
+(* user, because some files in a git repo can be ignored. When multiple *)
+(* roots are specified, we display this warning to the user when *)
+(* at least one root is a git repo. Should we be more precise and *)
+(* display which roots are git repos? *)


Comments are like this everywhere:

(* * * *)

But here each line is a comment.

git_repo field (not fields)

Comments are like this everywhere

Yeah, a setting somehow changed in my editor, and I keep forgetting to fix it....

dimitris-m · 2026-02-10T22:10:38Z

src/targeting/Find_targets.ml

+      (fun (t, s, gr) root ->
+        let t', s', gr' = get_targets_for_project conf root in
+        Fppath_set.union t t', s' @ s, gr || gr')


I would rename these variables (t, s, gr) to something that's immediately clear.

dimitris-m · 2026-02-10T22:13:26Z

src/targeting/Find_targets.ml

      skipped_targets
  in
-  (selected_targets, skipped_targets)
+  (selected_targets, skipped_targets, is_git_repo)


But we have a record type now, can we not reuse?

dimitris-m · 2026-02-10T22:17:52Z

src/osemgrep/reporting/Summary_report.ml

@@ -52,9 +51,7 @@ let pp_summary ~respect_gitignore ~(maturity : Maturity.t) ~max_target_bytes
                     targets_not_in_git += 1
                     continue
         if targets_not_in_git != dir_targets: *)
-      Some "Scan was limited to files tracked by git."
-    else None
-  in
+    Fmt.pf ppf "Scan was limited to files tracked by git.@\n";


Indentation of nested comment block.

dimitris-m

Left some comments that are easy to address.

Question:
Are there already tests for the case where is_git_repo = false and there are skipped files (non-git repo with actual skips)?

dimitris-m

lgtm

This MR contains the following updates: | Package | Update | Change | |---|---|---| | [opengrep/opengrep](https://github.com/opengrep/opengrep) | patch | `v1.16.0` → `v1.16.1` | MR created with the help of [el-capitano/tools/renovate-bot](https://gitlab.com/el-capitano/tools/renovate-bot). **Proposed changes to behavior should be submitted there as MRs.** --- ### Release Notes <details> <summary>opengrep/opengrep (opengrep/opengrep)</summary> ### [`v1.16.1`](https://github.com/opengrep/opengrep/releases/tag/v1.16.1): Opengrep 1.16.1 [Compare Source](opengrep/opengrep@v1.16.0...v1.16.1) #### Improvements - Pin Nuitka to 2.8.9 across all build workflows by [@dimitris-m](https://github.com/dimitris-m) in [#594](opengrep/opengrep#594) - Remove redundant pip and Nuitka dependencies by [@dimitris-m](https://github.com/dimitris-m) in [#573](opengrep/opengrep#573) - Support split rule/target directories in test subcommand by [@qkaiser](https://github.com/qkaiser) in [#576](opengrep/opengrep#576) #### Benchmarking - New benchmarking using hyperfine by [@dimitris-m](https://github.com/dimitris-m) in [#557](opengrep/opengrep#557) and [#579](opengrep/opengrep#579) #### Bug fixes - Allow multiple logical operators in metavariable comparison by [@maciejpirog](https://github.com/maciejpirog) in [#590](opengrep/opengrep#590) - In `--experimental`, don't report git untracked files as skipped with `--use-git-ignore` by [@maciejpirog](https://github.com/maciejpirog) in [#577](opengrep/opengrep#577) - C#: Add primary constructor arguments to base class by [@maciejpirog](https://github.com/maciejpirog) in [#589](opengrep/opengrep#589) - Dockerfile: Add missing buildkit constructs by [@maciejpirog](https://github.com/maciejpirog) in [#581](opengrep/opengrep#581) - Dockerfile: Fix CRLF and comment-in-continuation parsing by [@abezdina](https://github.com/abezdina) in [#586](opengrep/opengrep#586) - Rust: Fix taint propagation through variable shadowing by [@dimitris-m](https://github.com/dimitris-m) in [#572](opengrep/opengrep#572) - TS/TSX: Add support for the `satisfies` construct by [@maciejpirog](https://github.com/maciejpirog) in [#592](opengrep/opengrep#592) #### Installation - Add Windows install script (pwsh) by [@dimitris-m](https://github.com/dimitris-m) in [#569](opengrep/opengrep#569) - Ensure that install.ps1 works on ARM by [@dimitris-m](https://github.com/dimitris-m) in [#571](opengrep/opengrep#571) - Fix: handle unparseable cosign version in install.sh by [@dimitris-m](https://github.com/dimitris-m) in [#580](opengrep/opengrep#580) #### Documentation - Improve the README by [@dimitris-m](https://github.com/dimitris-m) in [#570](opengrep/opengrep#570) #### New Contributors - [@qkaiser](https://github.com/qkaiser) made their first contribution in [#576](opengrep/opengrep#576) - [@abezdina](https://github.com/abezdina) made their first contribution in [#586](opengrep/opengrep#586) **Full Changelog**: <opengrep/opengrep@v1.16.0...v1.16.1> </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever MR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this MR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this MR, check this box --- This MR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).

maciejpirog requested review from corneliuhoffman, dimitris-m and willem-delbare as code owners February 9, 2026 17:32

maciejpirog changed the title ~~In --experimental, don't report git untracked files as skipped with --use-git-ignore~~ In --experimental, don't report git untracked files as skipped with --use-git-ignore Feb 9, 2026

dimitris-m reviewed Feb 9, 2026

View reviewed changes

src/osemgrep/cli_scan/Diff_scan.ml Outdated Show resolved Hide resolved

dimitris-m reviewed Feb 9, 2026

View reviewed changes

maciejpirog force-pushed the mpir/experimental-git-untracked-file-is-not-error branch from 5f90e1d to 06b8b42 Compare February 10, 2026 10:28

maciejpirog added 3 commits February 10, 2026 16:02

don't report git untracked files as skipped with --use-git-ignore

114c2e1

semgrep -> opengrep in a msg to the user

7065b3f

rename targets to selected in the targets record

44332d3

maciejpirog force-pushed the mpir/experimental-git-untracked-file-is-not-error branch from 06b8b42 to 44332d3 Compare February 10, 2026 15:02

dimitris-m reviewed Feb 10, 2026

View reviewed changes

dimitris-m approved these changes Feb 10, 2026

View reviewed changes

don't transform to set and back in Find_targets

baef946

dimitris-m approved these changes Feb 12, 2026

View reviewed changes

maciejpirog merged commit a1a9fed into main Feb 12, 2026
6 checks passed

maciejpirog deleted the mpir/experimental-git-untracked-file-is-not-error branch February 12, 2026 15:21

maciejpirog mentioned this pull request Feb 17, 2026

Release v1.16.1 #593

Merged

dimitris-m mentioned this pull request Feb 17, 2026

Release v1.16.1 #595

Merged

Conversation

maciejpirog commented Feb 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Example when both messages appear:

Example of a scan of a git repo when no files tracked by git are actually skipped:

Example of a scan of a root that is not a git repo, but there are files skipped:

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dimitris-m left a comment

Choose a reason for hiding this comment

Uh oh!

dimitris-m left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

maciejpirog commented Feb 9, 2026 •

edited

Loading