From 018b24915bbcc5ec0b49a47a5a041abd6e2b8258 Mon Sep 17 00:00:00 2001
From: Georg Seibt <seibt@fim.uni-passau.de>
Date: Thu, 14 Apr 2016 13:09:16 +0200
Subject: [PATCH] check for exit success when finding the merge base
---
src/de/uni_passau/fim/seibt/gitwrapper/repo/Repository.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
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 9436933..f90179c 100644
--- a/src/de/uni_passau/fim/seibt/gitwrapper/repo/Repository.java
+++ b/src/de/uni_passau/fim/seibt/gitwrapper/repo/Repository.java
@@ -16,6 +16,8 @@ import java.util.stream.Collectors;
import de.uni_passau.fim.seibt.gitwrapper.process.ProcessExecutor.ExecRes;
+import static de.uni_passau.fim.seibt.gitwrapper.repo.GitWrapper.EXIT_SUCCESS;
+
/**
* A git {@link Repository}.
*/
@@ -94,7 +96,7 @@ public class Repository {
Optional<ExecRes> mergeBase = git.exec(dir, "merge-base", a.getId(), b.getId());
Function<ExecRes, Commit> toCommit = res -> {
- if (res.output.startsWith(FAILURE_PREFIX)) {
+ if (res.exitCode != EXIT_SUCCESS || res.output.startsWith(FAILURE_PREFIX)) {
return null;
}
--
GitLab