Skip to content

Improve logging when git diff fails #1490

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
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

Improve logging when git diff fails #1490

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e56181b
improve logging
kelvinou01 Nov 30, 2025
77eaec8
don't consume stdout if not error
kelvinou01 Dec 1, 2025
8f847ce
yikes
kelvinou01 Dec 1, 2025
749edd0
asdf
kelvinou01 Dec 1, 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
7 changes: 5 additions & 2 deletions gradle-palantir-java-format/src/main/java/com/palantir/javaformat/gradle/FormatDiff.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,11 @@ private static String gitCommand(Path dir, String... args) throws IOException, I
new ProcessBuilder().command(args).directory(dir.toFile()).start();

Preconditions.checkState(process.waitFor(30, TimeUnit.SECONDS), "git diff took too long to terminate");
Preconditions.checkState(process.exitValue() == 0, "Expected return code of 0");

if (process.exitValue() != 0) {
throw new RuntimeException("Expected return code of 0 but got " + process.exitValue()
+ "\n stdout: " + new String(process.getInputStream().readAllBytes())
+ "\n stderr: " + new String(process.getErrorStream().readAllBytes()));
}
ByteArrayOutputStream baos = new ByteArrayOutputStream();
process.getInputStream().transferTo(baos);
return new String(baos.toByteArray(), UTF_8).trim();
Expand Down