[8.5.0] Support checking out the repo's default branch in `git_repository`/`new_git_repository` rule #27705

bazel-io · 2025-11-18T10:59:14Z

The git_repository and new_git_repository rules currently require not only the remote repository URI to be specified but also either the branch, tag or revision (commit) to check out. This PR removes the latter requirement. If no branch, tag or revision are specified, the repo's default branch will be checked out.

The main reason for introducing this proposed change, is because I noticed certain Bazel rules already generate git_repository targets from git URIs or other git repo specs that might not have a branch, tag or revision specified. These rules then typically default to a branch name of master, which is not correct in general. This change will allow those rules to simply omit the branch, tag and revision from the generated git_repository targets, to check out the repo's default branch.

An alternative, more explicit, interface for specifying that the default branch is to be checked out, would have been to add an optional boolean default_branch attribute to the git_repository and new_git_repository rules. The presence of that attribute would be mutually exclusive with the presence of branch, tag and commit. Let me know if that interface is preferable.

Addresses issue #27610.

Closes #27611.

PiperOrigin-RevId: 833710273
Change-Id: I7bc18efcbcfcaba61bf27052fecceb50336d2eb3

Commit ee3af97

…ew_git_repository` rule The `git_repository` and `new_git_repository` rules currently require not only the remote repository URI to be specified but also either the branch, tag or revision (commit) to check out. This PR removes the latter requirement. If no branch, tag or revision are specified, the repo's default branch will be checked out. The main reason for introducing this proposed change, is because I noticed certain Bazel rules already generate `git_repository` targets from git URIs or other git repo specs that might not have a branch, tag or revision specified. These rules then typically default to a branch name of `master`, which is not correct in general. This change will allow those rules to simply omit the branch, tag and revision from the generated `git_repository` targets, to check out the repo's default branch. An alternative, more explicit, interface for specifying that the default branch is to be checked out, would have been to add an optional boolean `default_branch` attribute to the `git_repository` and `new_git_repository` rules. The presence of that attribute would be mutually exclusive with the presence of `branch`, `tag` and `commit`. Let me know if that interface is preferable. Addresses issue bazelbuild#27610. Closes bazelbuild#27611. PiperOrigin-RevId: 833710273 Change-Id: I7bc18efcbcfcaba61bf27052fecceb50336d2eb3

iancha1992 · 2025-11-18T18:01:39Z

@fmeum @meteorcloudy There are presubmit failures. Could you please take a look? Thanks!

meteorcloudy · 2025-11-19T10:15:55Z

@Pagten Can you please take a look at the test failure?

Pagten · 2025-11-19T11:42:29Z

The issue is in the GitRepositoryBlackBoxTest test. The file path of external repos is different between the 8.5.0 release branch and master.

This one-line change should fix the test (I verified this locally):

--- a/src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace/GitRepositoryBlackBoxTest.java
+++ b/src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace/GitRepositoryBlackBoxTest.java
@@ -181,7 +181,7 @@ public class GitRepositoryBlackBoxTest extends AbstractBlackBoxTest {
     // This creates Bazel without MSYS, see implementation for details.
     BuilderRunner bazel = WorkspaceTestUtils.bazel(context());
     bazel.build("@ext//:call_write_text");
-    Path outPath = context().resolveBinPath(bazel, "external/+new_git_repository+ext/out.txt");
+    Path outPath = context().resolveBinPath(bazel, "external/+_repo_rules+ext/out.txt");
     WorkspaceTestUtils.assertLinesExactly(outPath, HELLO_FROM_EXTERNAL_REPOSITORY);
   }

How should I go about getting this change into the bazel-io:cp27611-8.5.0 branch?

meteorcloudy · 2025-11-19T12:36:22Z

@Pagten Thanks for fixing this and sending the PR! I'll merge this once since it has a slightly better commit message.

Pagten · 2025-11-19T12:37:09Z

Sounds good. I'll close the other PR.

This upgrade brings several performance improvements and bug fixes: #### Performance improvements - remote execution: bazelbuild/bazel#27564 - module extensions: bazelbuild/bazel#27296 #### Reliability improvements - cache invalidation: bazelbuild/bazel#27417 - configuration: bazelbuild/bazel#27128 - Git repositories: bazelbuild/bazel#27705 - query: - bazelbuild/bazel#27560 - bazelbuild/bazel#27117 - registry mirrors: bazelbuild/bazel#27531 #### Bug fixes - remote cache: bazelbuild/bazel#27996 - repository handling: bazelbuild/bazel#27995 - repository cache: bazelbuild/bazel#28161 - local execution: bazelbuild/bazel#27994

This upgrade brings several performance improvements and bug fixes: ## Performance improvements (8.5.0) - Remote execution: Add --remote_max_concurrency_per_connection flag to control concurrent gRPC requests (default: 100) bazelbuild/bazel#27564 - Module extensions: Support storing/retrieving JSON-like Starlark objects without invalidation, reducing unnecessary rebuilds bazelbuild/bazel#27296 ## Reliability improvements (8.5.0) - Cache invalidation: Source directory contents now tracked for proper invalidation bazelbuild/bazel#27417 - Configuration: Add ctx.configuration.short_id for identifying configurations bazelbuild/bazel#27128 - Git repositories: git_repository now checks out default branch when unspecified bazelbuild/bazel#27705 - Query: Add executables() function and fix genquery for external repos bazelbuild/bazel#27560 bazelbuild/bazel#27117 - Registry mirrors: --module_mirrors now supports per-registry mirror specification bazelbuild/bazel#27531 ## Bug fixes (8.5.1) - Remote cache: Add option to continue with local execution if remote cache is unavailable bazelbuild/bazel#27996 - Repository handling: Fix crash when mixing use_repo_rule and --inject_repository bazelbuild/bazel#27995 - Repository cache: Fix permission denied issue with --experimental_repository_cache_hardlinks bazelbuild/bazel#28161 - Local execution: Fix incorrect SkyframeLookupResult usage bazelbuild/bazel#27994 Both 8.5.0 and 8.5.1 are fully backward compatible with Bazel 8.0. ## Dependency updates - Upgrade rules_go from 0.57.0 to 0.59.0 for Bazel 8.5+ compatibility bazel-contrib/rules_go#4493 - Configure sh_configure extension for rules_shell to auto-detect shell toolchain ## Platform-specific changes - Windows: Configure hermetic shell via --repo_env=BAZEL_SH which is used by both sh_configure (sh_binary/sh_test) and --shell_executable (genrule/run_shell). This eliminates dependency on system environment variables. - Windows: Disable code coverage collection (--nocollect_code_coverage) to avoid shell toolchain issues. Coverage requires sh_binary (collect_coverage) which needs a hermetic shell toolchain not yet available. bazelbuild/rules_shell#4 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>

This upgrade brings several performance improvements and bug fixes: #### Performance improvements - remote execution: bazelbuild/bazel#27564 - module extensions: bazelbuild/bazel#27296 #### Reliability improvements - cache invalidation: bazelbuild/bazel#27417 - configuration: bazelbuild/bazel#27128 - Git repositories: bazelbuild/bazel#27705 - query: - bazelbuild/bazel#27560 - bazelbuild/bazel#27117 - registry mirrors: bazelbuild/bazel#27531 #### Bug fixes - remote cache: bazelbuild/bazel#27996 - repository handling: bazelbuild/bazel#27995 - repository cache: bazelbuild/bazel#28161 - local execution: bazelbuild/bazel#27994

### What does this PR do? Bump `bazel` version from [8.4.2](https://github.com/bazelbuild/bazel/releases/tag/8.4.2) to [8.5.1](https://github.com/bazelbuild/bazel/releases/tag/8.5.1). To make that happen, we also need to: - specify which `bash` to use on Windows when evaluating **repository** rules, for compatibility with bazelbuild/bazel#26927: ``` ERROR: /path/to/external/bazel_tools/tools/test/BUILD:23:10: in sh_binary rule @@bazel_tools//tools/test:collect_coverage: Error in fail: No suitable shell toolchain found: * if you are running Bazel on Windows, set the BAZEL_SH environment variable to the path of bash.exe ``` (actual job output: https://gitlab.ddbuild.io/DataDog/datadog-agent/-/jobs/1349246422#L77) - bump `rules_go` from (implicit) [0.57.0](https://github.com/bazel-contrib/rules_go/releases/tag/v0.57.0) to (explicit) [0.59.0](https://github.com/bazel-contrib/rules_go/releases/tag/v0.59.0) for bazel-contrib/rules_go/pull/4493 to be compatible with bazelbuild/bazel/pull/27296: ``` Error: 'Facts' value has no field or method 'clear' ``` ### Motivation 1. this upgrade alone brings several improvements and bug fixes, among which: - bazelbuild/bazel#27117 - bazelbuild/bazel#27296 - bazelbuild/bazel#27417, covers: - bazelbuild/bazel#25834 - bazelbuild/bazel#25863 - bazelbuild/bazel#25864 - bazelbuild/bazel#25870 - bazelbuild/bazel#26698 - bazelbuild/bazel#27531 - bazelbuild/bazel#27560 - bazelbuild/bazel#27564 - bazelbuild/bazel#27705 - bazelbuild/bazel#27995 - bazelbuild/bazel#27996 2. `bazel` 9.0 is due soon, so better off favoring incremental bumps. ### Additional Notes Leveraging [the latter](bazelbuild/bazel#27996) might allow us to later reconsider whether we'd like to go back to the `--remote_cache` flag (instead of the `--remote_executor` flag that we had to switch to in #44962). Co-authored-by: regis.desgroppes <regis.desgroppes@datadoghq.com>

bazel-io added the team-ExternalDeps External dependency handling, remote repositiories, WORKSPACE file. label Nov 18, 2025

bazel-io requested a review from a team as a code owner November 18, 2025 10:59

bazel-io added the awaiting-review PR is awaiting review from an assigned reviewer label Nov 18, 2025

bazel-io requested review from fmeum and meteorcloudy November 18, 2025 10:59

bazel-io mentioned this pull request Nov 18, 2025

[8.5.0] Support checking out the repo's default branch in git_repository/new_git_repository rule #27704

Closed

meteorcloudy approved these changes Nov 18, 2025

View reviewed changes

meteorcloudy enabled auto-merge November 18, 2025 11:01

Pagten mentioned this pull request Nov 19, 2025

[8.5.0] Support checking out the repo's default branch in git_repository/new_git_repository rule #27725

Closed

Update output path for external repository test

76814a5

meteorcloudy added this pull request to the merge queue Nov 19, 2025

Merged via the queue into bazelbuild:release-8.5.0 with commit 39e9c72 Nov 19, 2025
46 checks passed

github-actions bot removed the awaiting-review PR is awaiting review from an assigned reviewer label Nov 19, 2025

rdesgroppes mentioned this pull request Jan 13, 2026

Bump bazel from 8.4.2 to 8.5.1 DataDog/datadog-agent#45022

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[8.5.0] Support checking out the repo's default branch in `git_repository`/`new_git_repository` rule #27705

[8.5.0] Support checking out the repo's default branch in `git_repository`/`new_git_repository` rule #27705

Uh oh!

bazel-io commented Nov 18, 2025

Uh oh!

iancha1992 commented Nov 18, 2025

Uh oh!

meteorcloudy commented Nov 19, 2025

Uh oh!

Pagten commented Nov 19, 2025

Uh oh!

meteorcloudy commented Nov 19, 2025

Uh oh!

Pagten commented Nov 19, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

[8.5.0] Support checking out the repo's default branch in git_repository/new_git_repository rule #27705

[8.5.0] Support checking out the repo's default branch in git_repository/new_git_repository rule #27705

Uh oh!

Conversation

bazel-io commented Nov 18, 2025

Uh oh!

iancha1992 commented Nov 18, 2025

Uh oh!

meteorcloudy commented Nov 19, 2025

Uh oh!

Pagten commented Nov 19, 2025

Uh oh!

meteorcloudy commented Nov 19, 2025

Uh oh!

Pagten commented Nov 19, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

[8.5.0] Support checking out the repo's default branch in `git_repository`/`new_git_repository` rule #27705

[8.5.0] Support checking out the repo's default branch in `git_repository`/`new_git_repository` rule #27705