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

project: don't plan a stateless prune without a worktree

2026-09-23T20:27:06+00:00

Skip stateless prune planning when a project's worktree directory does not exist, preventing fetch failures on subsequent syncs. Also run _LsRemote() bare so it does not depend on worktree existence. Bug: 565047698 Change-Id: I385cba4e06813d9113ec7ddc963e8499acffaec5 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/634426 Tested-by: Gavin Mak Commit-Queue: Gavin Mak Reviewed-by: Brian Gan

sync: skip the bloat check for projects without a worktree

2026-09-23T20:27:01+00:00

Skip shallow clone bloat checks during --network-only syncs and filter out projects whose worktree directory does not exist on disk. Also return None quietly from _GetStatusSnapshot() when a project lacks an existing worktree directory. Bug: 565047698 Change-Id: Ia4c7db36a2bd78bc89e7b72f7a492b901b50efa7 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/634425 Commit-Queue: Gavin Mak Reviewed-by: Brian Gan Tested-by: Gavin Mak

project: don't rerun git status after a failed snapshot

2026-09-23T20:26:55+00:00

When a status snapshot fails, fall back directly to _IsDirtyLegacy() instead of IsDirty() to avoid running git status twice. Expose Project.GetDirtyAndHead() so sync bloat checks can inspect worktree state without invoking private Project methods. Bug: 565047698 Change-Id: I6432ed82da88778eec9d151fd5b70bedb1efc62b Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/634424 Reviewed-by: Brian Gan Commit-Queue: Gavin Mak Tested-by: Gavin Mak

Fix fail in test_repo_trace if trace is disabled

2026-09-23T06:43:15+00:00

If env has REPO_TRACE 0, then the test produces: FileNotFoundError: No such file or directory: TRACE_FILE_from_test' because it assumes trace is always enabled. Improve by enabling trace for this test class. Also modify the repo_trace.SetTrace API to take an optional True/False if needed, still defaults to True though. Change-Id: I2bb4632eb45ee529fc1785833e0bafd9c36f0875 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/445541 Commit-Queue: Fredrik de Groot Reviewed-by: Mike Frysinger Reviewed-by: Brian Gan Tested-by: Fredrik de Groot

info: reuse branch snapshots and combine history walks

2026-09-21T20:40:06+00:00

Derive the current branch from GetBranches so attached HEAD and refs are resolved once, including overview reporting. Replace the two complementary rev-list calls in --all output with one --left-right symmetric-difference walk and partition its records in memory. Bug: 553599402 Change-Id: I01d5db804cbf591ecc0e08d6605971f0f5a38538 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/634005 Tested-by: Gavin Mak Reviewed-by: Brian Gan Commit-Queue: Gavin Mak

project: avoid unnecessary sync revision enumeration

2026-09-21T20:40:01+00:00

Skip the detached-history walk when its count will not be printed, ask rev-list --count for upstream gain, and cap the published-but-unmerged existence probe at one commit. These preserve the decisions while reducing traversal and output work. Bug: 553599402 Change-Id: I30f769c9aa5269428ece15ffcb45c50993d7c4b8 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/634004 Commit-Queue: Gavin Mak Tested-by: Gavin Mak Reviewed-by: Brian Gan

project: make fast-forward merges explicit

2026-09-21T20:39:56+00:00

Every caller expects _FastForward to reject a merge commit. Always pass --ff-only and remove the optional parameter so a violated ancestry assumption fails instead of silently creating a merge. Bug: 553599402 Change-Id: I04690b5ca675cb7d3062df08d5e20cd82f5b9e82 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/634003 Tested-by: Gavin Mak Reviewed-by: Brian Gan Commit-Queue: Gavin Mak

project: fold normal stash detection into status

2026-09-21T20:39:51+00:00

When Git 2.35 or newer supplies a stash header, use the same status snapshot for stateless dirty and stash checks. Retain rev-parse for earlier clients or when the status snapshot is unavailable. Bug: 543851900 Bug: 553599402 Change-Id: I6e310459d9c1a3ba7978f7907ae6b7a9bc611749 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/632146 Tested-by: Gavin Mak Commit-Queue: Gavin Mak Reviewed-by: Brian Gan

sync: reuse status HEAD in the bloat scan

2026-09-21T20:39:21+00:00

The shallow-project bloat check already needs dirty state. Request branch metadata in that same porcelain-v2 snapshot and use branch.oid instead of launching a separate rev-parse, with the existing calls retained as a fallback. Bug: 543851900 Bug: 553599402 Change-Id: I3e7068c2e14c025a53adf92bfe8483b876cfda9d Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/632145 Tested-by: Gavin Mak Reviewed-by: Brian Gan Commit-Queue: Gavin Mak

project: render worktree status from one snapshot

2026-09-21T20:39:16+00:00

Use porcelain-v2 branch and path records to replace the status display fan-out with one Git process on Git 2.11 and newer. Preserve the legacy renderer for older clients, force rename and ahead/behind behavior where supported, and fall back to the old divergence query only when status cannot supply branch.ab. Bug: 543851900 Bug: 553599402 Change-Id: Ic760360f4f48ab9320abf69dbbb7310dab4ac649 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/632144 Commit-Queue: Gavin Mak Reviewed-by: Brian Gan Tested-by: Gavin Mak