♻️ refactor(worktree): run git via -C to target repository#39
Conversation
Signed-off-by: samzong <samzong.lu@gmail.com>
Summary of ChangesHello @samzong, I'm Gemini Code Assist1! 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 significantly refactors the underlying Git command execution within the worktree management system. By consistently applying the Highlights
🧠 New Feature in Public Preview: You can now enable Memory to help Gemini Code Assist learn from your team's feedback. This makes future code reviews more consistent and personalized to your project's style. Click here to enable Memory in your admin console. Using Gemini Code AssistThe 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
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 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
|
There was a problem hiding this comment.
Code Review
This pull request refactors the way git commands are executed by using the -C flag to explicitly target the repository directory. This is a good improvement for robustness and clarity. The changes are applied consistently across prune, add, remove, and dup functionalities for worktrees. Additionally, the FindBareRoot function is improved to handle cases where the starting directory is the .bare directory itself, and this change is properly covered by a new test case. I have one minor suggestion to further improve code clarity by reducing a small amount of duplication. Overall, this is a solid refactoring.
| var args []string | ||
| branchExistsFlag, _ := c.branchExists(name) | ||
| if branchExistsFlag { | ||
| // Branch exists: create worktree from existing branch | ||
| args = []string{"worktree", "add", targetPath, name} | ||
| args = []string{"-C", repoDir, "worktree", "add", targetPath, name} | ||
| } else { | ||
| // Branch does not exist: create new branch | ||
| args = []string{"worktree", "add", "-b", name, targetPath, baseBranch} | ||
| args = []string{"-C", repoDir, "worktree", "add", "-b", name, targetPath, baseBranch} | ||
| } |
There was a problem hiding this comment.
To reduce code duplication and improve readability, you can initialize the args slice with the common command parts and then append the branch-specific arguments inside the if/else block.
| var args []string | |
| branchExistsFlag, _ := c.branchExists(name) | |
| if branchExistsFlag { | |
| // Branch exists: create worktree from existing branch | |
| args = []string{"worktree", "add", targetPath, name} | |
| args = []string{"-C", repoDir, "worktree", "add", targetPath, name} | |
| } else { | |
| // Branch does not exist: create new branch | |
| args = []string{"worktree", "add", "-b", name, targetPath, baseBranch} | |
| args = []string{"-C", repoDir, "worktree", "add", "-b", name, targetPath, baseBranch} | |
| } | |
| branchExistsFlag, _ := c.branchExists(name) | |
| args := []string{"-C", repoDir, "worktree", "add"} | |
| if branchExistsFlag { | |
| // Branch exists: create worktree from existing branch | |
| args = append(args, targetPath, name) | |
| } else { | |
| // Branch does not exist: create new branch | |
| args = append(args, "-b", name, targetPath, baseBranch) | |
| } |
No description provided.