tools/git-repo.git, branch v2.65

color: Treat "true" and "yes" as "auto", not "always"

2026-07-01T22:59:45+00:00

Per the git documentation for color.ui [1], setting color.ui to "true" (or "yes") should behave identically to "auto", enabling color only when output is written to a terminal or an active pager. Previously, repo was equating "true" and "yes" with "always", which caused color escape codes to be emitted unconditionally, even when output was piped or redirected. Replace the duplicated string-matching logic in SetDefaultColoring and Coloring.__init__ with a single CONFIG_TO_COLOR_SETTING dict that maps all git color config values to their behavior. This makes the mapping easy to verify against the git docs and impossible to get out of sync between the two call sites. Added tests for SetDefaultColoring and Coloring.__init__ covering all color mode values (auto, true, yes, always, never, no, false), case insensitivity, TTY vs pipe behavior, active pager detection, and unrecognised input. [1] https://git-scm.com/docs/git-config#Documentation/git-config.txt-colorui Bug: 295841573 Change-Id: I8a04b9c7e4154de37ed7518c010233039e0afdc9 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/602981 Tested-by: Brian Gan Reviewed-by: Gavin Mak Commit-Queue: Brian Gan

agents: run review agents manually

2026-07-01T22:45:23+00:00

The review agents are broken right now, so don't run them automatically. They should still be runnable on demand. Change-Id: I22e5ff46f917a49d0c267a0b1e8c63ae2165347d Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/603461 Reviewed-by: Brian Gan Commit-Queue: Brian Gan Tested-by: Gavin Mak Tested-by: Brian Gan

tests: Fix test compatibility with Python 3.14 forkserver

2026-06-30T22:35:57+00:00

Python 3.14 changed the default multiprocessing start method on Linux from "fork" to "forkserver". The test_forall_all_projects_called_once test uses mock.patch.object on Project.GetRevisionId, but class-level mock patches do not survive into forkserver worker processes because they start from a clean Python interpreter rather than inheriting the parent's memory. Replace the mock with setting revisionId directly on each Project instance so GetRevisionId() short-circuits without touching git. This works with any multiprocessing start method since the string attribute is part of the Project objects stored in _parallel_context, which is properly serialized to workers via initargs. Bug: 425319437 Change-Id: Icd3bbd010921d7652bb2425fad85974df9198367 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/602941 Tested-by: Brian Gan Commit-Queue: Brian Gan Reviewed-by: Gavin Mak

sync: Implement fetchcmd for standard Git layouts

2026-06-30T20:20:15+00:00

Introduce support for `repo.fetchcmd` configuration, allowing users to specify a custom command to fetch project data instead of `_RemoteFetch`. When `repo.fetchcmd` is specified, `repo` will execute it instead of `_RemoteFetch` during the network half of sync. Note that `repo.fetchcmd` requires `repo.uselocalgitdirs` to be enabled. The command is executed in a subshell with project-context environment variables, including the new `REPO_TREV` (target revision resolved to a commit hash) and `REPO_PROJECT_FETCH_URL`. After execution, `repo` verifies that the target commit is available and that the tracking ref and FETCH_HEAD are correctly updated. Tested with: ``` > ~/git-repo/repo init -u https://android-review.googlesource.com/platform/manifest \ --repo-url file:///usr/local/google/home/gavinmak/git-repo \ --groups developers \ --no-repo-verify \ --use-local-gitdirs ... > git config --file .repo/manifests.git/config repo.fetchcmd 'mkdir -p $REPO_PATH && cd $REPO_PATH && if [ ! -d .git ]; then git init && git remote add aosp $REPO_PROJECT_FETCH_URL; fi && git fetch aosp $REPO_TREV && git reset --hard $REPO_TREV && mkdir -p .git/refs/remotes/aosp && echo $REPO_TREV > .git/refs/remotes/aosp/main && echo $REPO_TREV > .git/FETCH_HEAD' > ~/git-repo/repo sync -j32 warning: repo is not tracking a remote branch, so it will not receive updates; run `repo init --repo-rev=stable` to fix. You are currently enrolled in Git submodules experiment (go/android-submodules-quickstart). Use --no-use-superproject to override. Syncing: 100% (4/4), done in 1m15.686s Finalizing sync state... repo sync has finished successfully. ``` Bug: 513329573 Change-Id: I754d3f3c78e86fdeee1a72115297a75b571bc497 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/583883 Reviewed-by: Becky Siegel Tested-by: Gavin Mak Commit-Queue: Gavin Mak

status: Show ahead/behind info for local branches

2026-06-30T18:13:14+00:00

When viewing `repo status`, it is difficult to distinguish between branches that have active unpushed changes and stale branches that are fully synced. Previously, developers had to run commands like `repo forall -c "git status"` to see their ahead/behind counts. This change updates Project.PrintWorkTreeStatus to automatically calculate and display the number of commits a branch is ahead and/or behind its upstream tracking branch. We use `git rev-list --left-right --count` to fetch this information natively and efficiently. If the branch is completely synced with upstream, no extra text is shown. Added tests for ahead-only, behind-only, diverged, no-tracking, and fully-synced branch states. Bug: 319412954 Change-Id: I23879b2d472c7a7e11d01b565428a84b1b4f09c1 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/602423 Reviewed-by: Gavin Mak Tested-by: Brian Gan Commit-Queue: Brian Gan

info: Parallelize project data gathering for JSON output

2026-06-30T16:19:35+00:00

https://gerrit-review.googlesource.com/c/git-repo/+/581921 parallelized `repo info` for text output. This commit does the same for JSON output format. Benchmarked `repo info --format=json` on an Android workspace with ~3k projects (N=3): - Before (sequential): 1m 30s average - After (parallelized): 46s average (~2x speedup) Verified that the JSON output is identical before and after. Bug: 526685287 Change-Id: If573223aba584f8b932f87d29e34ed565c5c930a Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/601861 Commit-Queue: Gavin Mak Reviewed-by: Brian Gan Tested-by: Gavin Mak

git_trace2_event_log: Fix index out of range on empty config values

2026-06-30T11:44:38+00:00

In git_trace2_event_log_base.py's GetDataEventName method, it parses value to identify if it represents a JSON list. When a config key has an empty string value, GetDataEventName evaluates value[0], which raises IndexError: string index out of range. This change fixes the crash by checking if the value is a string and using startswith/endswith to check for JSON lists instead of direct indexing. Test: PYTHONPATH=. pytest tests/test_git_trace2_event_log.py Bug: 512518342 TAG=agy CONV=ff5d70d7-e5b3-42b3-8f16-23b9e3070754 Change-Id: Ic40a8c6a22df57d0e97f268f6e1bc8a14a5024a4 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/602201 Reviewed-by: Gavin Mak Tested-by: Rahul Yadav Commit-Queue: Rahul Yadav

repo: Normalize GNUPGHOME path for MSYS GPG on Windows

2026-06-29T18:06:23+00:00

Convert GNUPGHOME to a POSIX path using cygpath on Windows so MSYS GPG can read it correctly. Bug: 510840000 Change-Id: I7d25564dd6521f6e887ff45548f42984e709ef5e Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/601121 Tested-by: Gavin Mak Reviewed-by: Brian Gan Commit-Queue: Gavin Mak

info: Report actual checked-out HEAD revision

2026-06-29T17:50:02+00:00

When `repo info` runs, the reported "Current revision" is resolved using the manifest's target branch tracking ref (e.g. refs/remotes/goog/main). Introduce Project.GetHeadRevisionId(), which gets the checked-out HEAD commit in the worktree, and use it in `repo info` with a fallback to the old behavior if the project is not checked out. Bug: 526685287 Change-Id: I72280ce27daa210cada27d722a94e365644f06e0 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/599481 Reviewed-by: Brian Gan Commit-Queue: Gavin Mak Tested-by: Gavin Mak

git_config: Support SHA-256 object IDs

2026-06-26T22:40:55+00:00

Update ID_RE to match both 40-char (SHA-1) and 64-char (SHA-256) IDs as part of Git 3.0 support. Bug: 483758905 Change-Id: Ie5d9a2a5df4c6e7adda7f1d89f1bfb7724846057 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/600341 Reviewed-by: Brian Gan Tested-by: Gavin Mak Reviewed-by: Mike Frysinger Commit-Queue: Gavin Mak