(refs #375)Show merge commit diffs correctly

2025-11-05 04:56:02 +01:00 · 2014-05-20 21:26:51 +09:00
parent a863951d97
commit 29812f4a82
1 changed files with 6 additions and 1 deletions
--- a/src/main/scala/util/JGitUtil.scala
+++ b/src/main/scala/util/JGitUtil.scala
@@ -372,7 +372,12 @@ object JGitUtil {

      if(commits.length >= 2){
        // not initial commit
-        val oldCommit = commits(1)
+        val oldCommit = if(revCommit.getParentCount >= 2) {
+          // merge commit
+          revCommit.getParents.head
+        } else {
+          commits(1)
+        }
        (getDiffs(git, oldCommit.getName, id, fetchContent), Some(oldCommit.getName))

      } else {