fix: editor var expansion #603

Brookke · 2025-09-29T09:09:46Z

This handles cases where the git editor is set to $EDITOR. The steps for reproducing are as follows.

Set the EDITOR env var
Update your .gitconfig to include editor=$EDITOR
Run av pr --edit

According to man 1 git-var, GIT_EDITOR is "meant to be interpreted by the shell when it is used". Hence, this variable needs to be interpreted.

Credit to @tgandrews for spotting the issue

aviator-app · 2025-09-29T09:09:51Z

Current Aviator status

Aviator will automatically update this comment as the status of the PR changes.
Comment /aviator refresh to force Aviator to re-examine your PR (or learn about other /aviator commands).

This PR was merged using Aviator.

See the real-time status of this PR on the Aviator webapp.

Use the Aviator Chrome Extension to see the status of your PR within GitHub.

aviator-app · 2025-09-29T09:09:52Z

✅ FlexReview Status

Common Owner: aviator-co/engineering (expert-load-balance assignment)
Owner and Assignment:

✅ aviator-co/engineering (expert-load-balance assignment)
- Slack: #av-slack-testing
- Assigned: draftcode
Owned Files
- internal/editor/editor.go
CODEOWNERS Required Files
- internal/editor/editor.go

Review SLO: 7 business hours if PR size is <= 200 LOC for the first response.

gemini-code-assist · 2025-09-29T09:09:57Z

Summary of Changes

Hello @Brookke, 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 resolves an issue where environment variables embedded within the editor command string were not being expanded, leading to incorrect editor invocation. By integrating os.ExpandEnv, the system can now correctly interpret and execute editor configurations that rely on dynamic environment variable values, enhancing the flexibility and robustness of editor command resolution.

Highlights

Environment Variable Expansion: The pull request introduces a fix to correctly expand environment variables within the configured editor command string.
Editor Command Resolution: This change specifically addresses scenarios where the editor command itself might contain references to other environment variables, such as GIT_EDITOR="$EDITOR", ensuring they are properly resolved.

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.

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

This pull request aims to add support for environment variable expansion in the Git editor command, for cases like GIT_EDITOR="$EDITOR". However, the current implementation using os.ExpandEnv is not safe as it doesn't respect shell quoting rules, which can lead to incorrect behavior and potential security vulnerabilities. I've left a comment with a detailed explanation and a suggestion for a more robust implementation that involves executing the command through a shell, which is how Git itself handles it.

internal/editor/editor.go

Brookke · 2025-09-29T10:52:18Z

/gemini review

gemini-code-assist

Code Review

This pull request correctly changes the editor launching logic to use a shell, which enables support for environment variable expansion in the editor command (e.g., GIT_EDITOR="$EDITOR"). This also implicitly fixes a bug where filenames with spaces were not handled correctly. The approach is sound, but I have one suggestion to improve portability.

internal/editor/editor.go

draftcode · 2025-09-30T03:33:37Z

Can you explain what you want to solve? If the shell has GIT_EDITOR="$EDITOR" as an env var, that expansion would have done inside that shell level before calling av, so av will see the expanded GIT_EDITOR env var I suppose?

Brookke · 2025-09-30T08:58:29Z

Can you explain what you want to solve? If the shell has GIT_EDITOR="$EDITOR" as an env var, that expansion would have done inside that shell level before calling av, so av will see the expanded GIT_EDITOR env var I suppose?

@draftcode

This happens when the editor is read from the .gitconfig, I mistakenly thought it would also happen for GIT_EDITOR.

So the steps for reproducing were as follows.

Set the EDITOR env var
Update your .gitconfig to include editor=$EDITOR
Run av pr --edit

❯ av pr --edit
Updating pull request for branch test-branch:
  - pushing to origin/test-branch
  - saved pull request description to <omitted> (it will be automatically re-used if you try again)
error: text editor failed: command "$EDITOR" failed: exec: "$EDITOR": executable file not found in $PATH

I'll also update the PR description

draftcode · 2025-10-01T01:49:00Z

Can you explain what you want to solve? If the shell has GIT_EDITOR="$EDITOR" as an env var, that expansion would have done inside that shell level before calling av, so av will see the expanded GIT_EDITOR env var I suppose?

@draftcode

This happens when the editor is read from the .gitconfig, I mistakenly thought it would also happen for GIT_EDITOR.

So the steps for reproducing were as follows.

Set the EDITOR env var

Update your .gitconfig to include editor=$EDITOR

Run av pr --edit
❯ av pr --edit
Updating pull request for branch test-branch:
  - pushing to origin/test-branch
  - saved pull request description to <omitted> (it will be automatically re-used if you try again)
error: text editor failed: command "$EDITOR" failed: exec: "$EDITOR": executable file not found in $PATH
I'll also update the PR description

Thanks. I added a reference as well to the PR description.

fix: editor var expansion

23dd59f

Brookke requested a review from a team as a code owner September 29, 2025 09:09

aviator-app bot requested a review from draftcode September 29, 2025 09:09

gemini-code-assist bot reviewed Sep 29, 2025

View reviewed changes

internal/editor/editor.go Outdated Show resolved Hide resolved

Brookke added 2 commits September 29, 2025 10:11

Merge branch 'master' into fix-editor-var

f5bd1c6

alternative

e5bfdbf

gemini-code-assist bot reviewed Sep 29, 2025

View reviewed changes

internal/editor/editor.go Outdated Show resolved Hide resolved

draftcode approved these changes Oct 1, 2025

View reviewed changes

draftcode and others added 2 commits October 1, 2025 17:33

Use sh instead of /bin/sh

6f28bd9

Merge branch 'master' into fix-editor-var

377f21d

aviator-app bot merged commit 96a1052 into aviator-co:master Oct 1, 2025
4 of 5 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

fix: editor var expansion #603

fix: editor var expansion #603

Uh oh!

Brookke commented Sep 29, 2025 •

edited by draftcode

Loading

Uh oh!

aviator-app bot commented Sep 29, 2025 •

edited

Loading

Uh oh!

aviator-app bot commented Sep 29, 2025 •

edited

Loading

Uh oh!

gemini-code-assist bot commented Sep 29, 2025

Uh oh!

gemini-code-assist bot left a comment

Uh oh!

Uh oh!

Brookke commented Sep 29, 2025

Uh oh!

gemini-code-assist bot left a comment

Uh oh!

Uh oh!

draftcode commented Sep 30, 2025

Uh oh!

Brookke commented Sep 30, 2025 •

edited

Loading

Uh oh!

draftcode commented Oct 1, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

fix: editor var expansion #603

fix: editor var expansion #603

Uh oh!

Conversation

Brookke commented Sep 29, 2025 • edited by draftcode Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

aviator-app bot commented Sep 29, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Current Aviator status

Uh oh!

aviator-app bot commented Sep 29, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

✅ FlexReview Status

Uh oh!

gemini-code-assist bot commented Sep 29, 2025

Summary of Changes

Highlights

Footnotes

Uh oh!

gemini-code-assist bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

Uh oh!

Brookke commented Sep 29, 2025

Uh oh!

gemini-code-assist bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

Uh oh!

draftcode commented Sep 30, 2025

Uh oh!

Brookke commented Sep 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

draftcode commented Oct 1, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Brookke commented Sep 29, 2025 •

edited by draftcode

Loading

aviator-app bot commented Sep 29, 2025 •

edited

Loading

aviator-app bot commented Sep 29, 2025 •

edited

Loading

Brookke commented Sep 30, 2025 •

edited

Loading