Skip to content

Fix GitClientTest.test git diff when diff.noprefix=true is used #9947

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

Open
deejgregor wants to merge 1 commit into
base: master
Choose a base branch
from
+26 −19
Open

Fix GitClientTest.test git diff when diff.noprefix=true is used #9947

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion .../agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/GitDiffParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
public class GitDiffParser {

private static final Pattern CHANGED_FILE_PATTERN =
Pattern.compile("^diff --git a/(?<oldfilename>.+) b/(?<newfilename>.+)$");
Pattern.compile("^diff --git (?<oldfilename>.+) (?<newfilename>.+)$");
private static final Pattern CHANGED_LINES_PATTERN =
Pattern.compile("^@@ -\\d+(,\\d+)? \\+(?<startline>\\d+)(,(?<count>\\d+))? @@");

Expand Down
9 changes: 8 additions & 1 deletion ...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 @@ -929,14 +929,21 @@ public LineDiff getGitDiff(String baseCommit, String targetCommit)
"diff",
"-U0",
"--word-diff=porcelain",
"--no-prefix",
baseCommit,
targetCommit));
} else {
return executeCommand(
Command.DIFF,
() ->
commandExecutor.executeCommand(
GitDiffParser::parse, "git", "diff", "-U0", "--word-diff=porcelain", baseCommit));
GitDiffParser::parse,
"git",
"diff",
"-U0",
"--word-diff=porcelain",
"--no-prefix",
baseCommit));
}
}

Expand Down
12 changes: 6 additions & 6 deletions ...t/agent-ci-visibility/src/test/resources/datadog/trace/civisibility/git/tree/git-diff.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
diff --git a/java/maven-junit4/pom.xml b/java/maven-junit4/pom.xml
diff --git java/maven-junit4/pom.xml java/maven-junit4/pom.xml
index 6d73cda..2a1f220 100644
--- a/java/maven-junit4/pom.xml
+++ b/java/maven-junit4/pom.xml
--- java/maven-junit4/pom.xml
+++ java/maven-junit4/pom.xml
@@ -10 +10 @@

-<name>java-maven-junit4</name>
+<name>java-maven-junit4-test-project</name>
~
diff --git a/java/maven-junit5/pom.xml b/java/maven-junit5/pom.xml
diff --git java/maven-junit5/pom.xml java/maven-junit5/pom.xml
index 7b92d64..834a61c 100644
--- a/java/maven-junit5/pom.xml
+++ b/java/maven-junit5/pom.xml
--- java/maven-junit5/pom.xml
+++ java/maven-junit5/pom.xml
@@ -14 +14 @@

-<module>module-b</module>
Expand Down
22 changes: 11 additions & 11 deletions ...-ci-visibility/src/test/resources/datadog/trace/civisibility/git/tree/larger-git-diff.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
diff --git a/java/maven-junit4/pom.xml b/java/maven-junit4/pom.xml
diff --git java/maven-junit4/pom.xml java/maven-junit4/pom.xml
index 6d73cda..2a1f220 100644
--- a/java/maven-junit4/pom.xml
+++ b/java/maven-junit4/pom.xml
--- java/maven-junit4/pom.xml
+++ java/maven-junit4/pom.xml
@@ -10 +10 @@

-<name>java-maven-junit4</name>
+<name>java-maven-junit4-test-project</name>
~
diff --git a/java/maven-junit5/module-a/pom.xml b/java/maven-junit5/module-a/pom.xml
diff --git java/maven-junit5/module-a/pom.xml java/maven-junit5/module-a/pom.xml
index 29a3a73..4567037 100644
--- a/java/maven-junit5/module-a/pom.xml
+++ b/java/maven-junit5/module-a/pom.xml
--- java/maven-junit5/module-a/pom.xml
+++ java/maven-junit5/module-a/pom.xml
@@ -8,3 +8,3 @@

-<groupId>com.datadog.ci.test</groupId>
Expand Down Expand Up @@ -53,10 +53,10 @@ index 29a3a73..4567037 100644
@@ -34 +40 @@
</project>
~
diff --git a/java/maven-junit5/module-b/pom.xml b/java/maven-junit5/module-b/pom.xml
diff --git java/maven-junit5/module-b/pom.xml java/maven-junit5/module-b/pom.xml
deleted file mode 100644
index f18dd09..0000000
--- a/java/maven-junit5/module-b/pom.xml
--- java/maven-junit5/module-b/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
Expand Down Expand Up @@ -91,10 +91,10 @@ index f18dd09..0000000
~
-</project>
~
diff --git a/java/maven-junit5/pom.xml b/java/maven-junit5/pom.xml
diff --git java/maven-junit5/pom.xml java/maven-junit5/pom.xml
index 7b92d64..834a61c 100644
--- a/java/maven-junit5/pom.xml
+++ b/java/maven-junit5/pom.xml
--- java/maven-junit5/pom.xml
+++ java/maven-junit5/pom.xml
@@ -14 +14 @@

-<module>module-b</module>
Expand Down