Skip to content

Add repo root as safe directory on git client creation #9033

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

Merged
daniel-mohedano merged 3 commits into from
Jun 26, 2025
Merged

Add repo root as safe directory on git client creation #9033

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
57b2212
add repo root as safe directory on git client creation
daniel-mohedano Jun 25, 2025
ddeeecb
rename method
daniel-mohedano Jun 25, 2025
6f1ed2c
Merge branch 'master' into daniel.mohedano/git-config-safe-directory
daniel-mohedano Jun 26, 2025
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
24 changes: 22 additions & 2 deletions ...agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/ShellGitClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -980,6 +980,23 @@ public LineDiff getGitDiff(String baseCommit, String targetCommit)
}
}

private void makeRepoRootSafeDirectory() {
// Some CI envs check out the repo as a different user than the one running the command
// This will avoid the "dubious ownership" error
try {
commandExecutor.executeCommand(
ShellCommandExecutor.OutputParser.IGNORE,
"git",
"config",
"--global",
"--add",
"safe.directory",
repoRoot);
} catch (IOException | TimeoutException | InterruptedException e) {
LOGGER.debug("Failed to add safe directory", e);
}
}

@Override
public String toString() {
return "GitClient{" + repoRoot + "}";
Expand Down Expand Up @@ -1025,8 +1042,11 @@ public Factory(Config config, CiVisibilityMetricCollector metricCollector) {
public GitClient create(@Nullable String repoRoot) {
long commandTimeoutMillis = config.getCiVisibilityGitCommandTimeoutMillis();
if (repoRoot != null) {
return new ShellGitClient(
metricCollector, repoRoot, "1 month ago", 1000, commandTimeoutMillis);
ShellGitClient client =
new ShellGitClient(
metricCollector, repoRoot, "1 month ago", 1000, commandTimeoutMillis);
client.makeRepoRootSafeDirectory();
return client;
} else {
LOGGER.debug("Could not determine repository root, using no-op git client");
return NoOpGitClient.INSTANCE;
Expand Down