Skip to content

Commit d6d1743

Browse files
authored
Merge pull request #3781 from github/henrymercer/update-git-minimum-version
Update minimum Git version for overlay to 2.36.0
2 parents ea5f719 + 65d2efa commit d6d1743

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ See the [releases page](https://github.com/github/codeql-action/releases) for th
44

55
## [UNRELEASED]
66

7-
No user facing changes.
7+
- Fix incorrect minimum required Git version for [improved incremental analysis](https://github.com/github/roadmap/issues/1158): it should have been 2.36.0, not 2.11.0. [#3781](https://github.com/github/codeql-action/pull/3781)
88

99
## 4.35.0 - 27 Mar 2026
1010

lib/init-action.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/git-utils.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ import {
1414
import { ConfigurationError, getRequiredEnvParam } from "./util";
1515

1616
/**
17-
* Minimum Git version required for overlay analysis. The
18-
* `git ls-files --recurse-submodules` option, which is used by
19-
* `getFileOidsUnderPath`, was introduced in Git 2.11.0.
17+
* Minimum Git version required for overlay analysis. Support for using the `git ls-files
18+
* --recurse-submodules` option with `--stage` was added in Git 2.36.0. For more information, see
19+
* `getFileOidsUnderPath`.
2020
*/
21-
export const GIT_MINIMUM_VERSION_FOR_OVERLAY = "2.11.0";
21+
export const GIT_MINIMUM_VERSION_FOR_OVERLAY = "2.36.0";
2222

2323
/**
2424
* Git version information
@@ -261,8 +261,8 @@ export const getFileOidsUnderPath = async function (
261261
// Without the --full-name flag, the path is relative to the current working
262262
// directory of the git command, which is basePath.
263263
//
264-
// We use --stage rather than --format here because --stage has been available since Git 2.11.0,
265-
// while --format was only introduced in Git 2.38.0, which would limit overlay rollout.
264+
// We use --stage rather than --format here because --stage has been available since Git 2.36.0,
265+
// while --format was only introduced in Git 2.38.0.
266266
const stdout = await runGitCommand(
267267
basePath,
268268
["ls-files", "--recurse-submodules", "--stage"],

0 commit comments

Comments
 (0)