From 314b610f403a7ce441353d4893e7f66775b1cf5f Mon Sep 17 00:00:00 2001
From: Georg Seibt <seibt@fim.uni-passau.de>
Date: Mon, 10 Oct 2016 16:16:25 +0200
Subject: [PATCH] fix: empty commit was produced if there were no merge commits
(String::split produced a 1 element array for an empty string)
---
.../uni_passau/fim/seibt/gitwrapper/repo/Repository.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/de/uni_passau/fim/seibt/gitwrapper/repo/Repository.java b/src/de/uni_passau/fim/seibt/gitwrapper/repo/Repository.java
index 3769fee..a27a49b 100644
--- a/src/de/uni_passau/fim/seibt/gitwrapper/repo/Repository.java
+++ b/src/de/uni_passau/fim/seibt/gitwrapper/repo/Repository.java
@@ -115,10 +115,13 @@ public class Repository {
return null;
}
- String[] lines = res.stdOut.split("[\\r?\\n]+");
+ String[] lines = res.stdOut.isEmpty() ? new String[] {} : res.stdOut.split("[\\r?\\n]+");
LOG.fine(() -> String.format("Found %d merge commits in %s.", lines.length, this));
- LOG.finer(() -> String.format("Merge commits are:%n%s", String.join(System.lineSeparator(), lines)));
+
+ if (lines.length > 0) {
+ LOG.finer(() -> String.format("Merge commits are:%n%s", String.join(System.lineSeparator(), lines)));
+ }
return Arrays.stream(lines).map(this::getCommitUnchecked).collect(Collectors.toList());
};
--
GitLab