Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Proper check for git repository #5213

Merged
merged 1 commit into from
Aug 22, 2023
Merged

Proper check for git repository #5213

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions base/src/com/google/idea/blaze/base/vcs/git/GitBlazeVcsHandlerProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,10 +125,11 @@ private static String getGitUpstreamContent(WorkspaceRoot workspaceRoot, Workspa
}

private static boolean isGitRepository(WorkspaceRoot workspaceRoot) {
// TODO: What if the git repo root is a parent directory of the workspace root?
// Just call 'git rev-parse --is-inside-work-tree' or similar instead?
File gitDir = new File(workspaceRoot.directory(), ".git");
return FileOperationProvider.getInstance().isDirectory(gitDir);
ByteArrayOutputStream stdout = new ByteArrayOutputStream();

String[] args = new String[] {"git", "rev-parse", "--is-inside-work-tree"};
int retVal = ExternalTask.builder(workspaceRoot).args(args).stdout(stdout).build().run();
return retVal == 0 && "true".equals(StringUtil.trimEnd(stdout.toString(), "\n"));
}

/**
Expand Down
Loading