Prevent git lock conflicts in daemon background polling

[AnnatarHe]

Summary

This change prevents the daemon from acquiring optional git locks when polling repository status in the background, eliminating conflicts with user-initiated git operations.

Key Changes

• Added gitCmd() helper function that wraps exec.CommandContext and sets the GIT_OPTIONAL_LOCKS=0 environment variable
• Replaced all direct exec.CommandContext calls in GetGitInfo() with the new gitCmd() helper
• Updated three git command invocations: rev-parse --git-dir, rev-parse --abbrev-ref HEAD, and status --porcelain

Implementation Details

The GIT_OPTIONAL_LOCKS=0 environment variable is equivalent to passing --no-optional-locks to every git command. This prevents the daemon from holding locks that could block user-initiated git operations while it performs background status checks. The helper function centralizes this behavior for consistency and maintainability.

https://claude.ai/code/session_01QqiZJAKYLKtTxLZt7tREhu

---

[gemini-code-assist]

Summary of Changes

Hello @AnnatarHe, I'm Gemini Code Assist¹! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request addresses potential conflicts between the daemon's background Git polling and user-initiated Git operations. By ensuring that background Git commands do not acquire optional locks, it improves the reliability and responsiveness of Git interactions, preventing situations where the daemon might inadvertently block user workflows.

Highlights

• New gitCmd() helper function: Introduced a gitCmd() helper function that wraps exec.CommandContext to execute Git commands.
• Git lock prevention: The gitCmd() helper automatically sets the GIT_OPTIONAL_LOCKS=0 environment variable to prevent optional Git locks during background polling.
• Refactored Git command invocations: Replaced direct exec.CommandContext calls within GetGitInfo() with the new gitCmd() helper for rev-parse --git-dir, rev-parse --abbrev-ref HEAD, and status --porcelain commands.

Changelog

• daemon/git.go
  • Imported the os package.
  • Added a new gitCmd helper function to encapsulate Git command execution with specific environment variables.
  • Updated existing Git command calls (rev-parse --git-dir, rev-parse --abbrev-ref HEAD, status --porcelain) to use the new gitCmd helper.

Activity

• No human activity has been recorded for this pull request yet.

Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature	Command	Description
Code Review	/gemini review	Performs a code review for the current pull request in its current state.
Pull Request Summary	/gemini summary	Provides a summary of the current pull request in its current state.
Comment	@gemini-code-assist	Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help	/gemini help	Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution. ↩

[gemini-code-assist]

Code Review

The pull request effectively addresses the issue of git lock conflicts by introducing a helper function gitCmd that sets GIT_OPTIONAL_LOCKS=0 for all git commands executed by the daemon. This is a good approach to prevent interference with user-initiated git operations. The changes are well-contained and directly target the problem described.

[codecov]

Codecov Report

✅ All modified and coverable lines are covered by tests.

Flag	Coverage Δ
unittests	37.51% <100.00%> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing lines	Coverage Δ
daemon/git.go	100.00% <100.00%> (ø)

... and 2 files with indirect coverage changes

🚀 New features to boost your workflow:

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

[devin-ai-integration]

✅ Devin Review: No Issues Found

Devin Review analyzed this PR and found no potential bugs to report.

View in Devin Review to see 2 additional findings.