From 126a3465d680f1352393765cf221a31131dd7706 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Sat, 22 Sep 2018 09:29:37 +0900 Subject: [PATCH] (ref #2145)Fix patch output --- src/main/scala/gitbucket/core/util/JGitUtil.scala | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/scala/gitbucket/core/util/JGitUtil.scala b/src/main/scala/gitbucket/core/util/JGitUtil.scala index 07881c649..6e8084c41 100644 --- a/src/main/scala/gitbucket/core/util/JGitUtil.scala +++ b/src/main/scala/gitbucket/core/util/JGitUtil.scala @@ -613,8 +613,12 @@ object JGitUtil { df.setRepository(git.getRepository) df.setDiffComparator(RawTextComparator.DEFAULT) df.setDetectRenames(true) - df.format(getDiffEntries(git, from, to).head) - new String(out.toByteArray, "UTF-8") + getDiffEntries(git, from, to) + .map { entry => + df.format(entry) + new String(out.toByteArray, "UTF-8") + } + .mkString("\n") } private def getDiffEntries(git: Git, from: Option[String], to: String): Seq[DiffEntry] = {